diff --git a/app/Http/Controllers/V6/API/PlaylistFolderController.php b/app/Http/Controllers/V6/API/PlaylistFolderController.php
index dbe1aa68..9888d6db 100644
--- a/app/Http/Controllers/V6/API/PlaylistFolderController.php
+++ b/app/Http/Controllers/V6/API/PlaylistFolderController.php
@@ -27,7 +27,7 @@ class PlaylistFolderController extends Controller
{
$this->authorize('own', $playlistFolder);
- return PlaylistFolderResource::make($this->service->updateFolder($playlistFolder, $request->name));
+ return PlaylistFolderResource::make($this->service->renameFolder($playlistFolder, $request->name));
}
public function destroy(PlaylistFolder $playlistFolder)
diff --git a/app/Models/PlaylistFolder.php b/app/Models/PlaylistFolder.php
index adff52a3..2b019795 100644
--- a/app/Models/PlaylistFolder.php
+++ b/app/Models/PlaylistFolder.php
@@ -33,7 +33,7 @@ class PlaylistFolder extends Model
public function playlists(): HasMany
{
- return $this->hasMany(Playlist::class);
+ return $this->hasMany(Playlist::class, 'folder_id');
}
public function user(): BelongsTo
diff --git a/app/Services/PlaylistFolderService.php b/app/Services/PlaylistFolderService.php
index f152fd37..12dbfd66 100644
--- a/app/Services/PlaylistFolderService.php
+++ b/app/Services/PlaylistFolderService.php
@@ -13,7 +13,7 @@ class PlaylistFolderService
return $user->playlist_folders()->create(['name' => $name]);
}
- public function updateFolder(PlaylistFolder $folder, string $name): PlaylistFolder
+ public function renameFolder(PlaylistFolder $folder, string $name): PlaylistFolder
{
$folder->update(['name' => $name]);
diff --git a/app/Services/PlaylistService.php b/app/Services/PlaylistService.php
index ec48cb47..69ccc898 100644
--- a/app/Services/PlaylistService.php
+++ b/app/Services/PlaylistService.php
@@ -42,7 +42,7 @@ class PlaylistService
$playlist->songs()->detach($songIds);
}
- /** @deprecated */
+ /** @deprecated since v6.0.0, use add/removeSongs methods instead */
public function populatePlaylist(Playlist $playlist, array $songIds): void
{
$playlist->songs()->sync($songIds);
diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index fe4ece04..1c46d4a7 100644
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -1,28 +1,26 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/resources/assets/js/components/artist/__snapshots__/ArtistContextMenu.spec.ts.snap b/resources/assets/js/components/artist/__snapshots__/ArtistContextMenu.spec.ts.snap
index 54677f8f..75356846 100644
--- a/resources/assets/js/components/artist/__snapshots__/ArtistContextMenu.spec.ts.snap
+++ b/resources/assets/js/components/artist/__snapshots__/ArtistContextMenu.spec.ts.snap
@@ -1,7 +1,7 @@
// Vitest Snapshot v1
exports[`renders 1`] = `
-