Обновил страницы админки "Артист" и "Альбом", удалил лишнее поле в модели "Альбом"

music_storage/music/admin.py

@@ -1,4 +1,9 @@
+from typing import Any
+
 from django.contrib import admin
+from django.http import HttpRequest
+from django.urls import reverse
+from django.utils.html import format_html
 
 from music.models import Track, Album, Artist
 
@@ -6,14 +11,26 @@ from music.models import Track, Album, Artist
 @admin.register(Track)
 class TrackAdmin(admin.ModelAdmin):
     class Media:
-        js = ('admin/js/upload_progress.js',)
+        js = ("admin/js/upload_progress.js",)
-        css = {
+        css = {"all": ("admin/css/upload_progress.css",)}
-            'all': ('admin/css/upload_progress.css',)
-        }
 
-    list_display = ("artist__name", "title", "created_by", "created_at")
+    list_display = ("album__artist__name", "title", "created_by", "created_at")
-    search_fields = ("title", "artist__name", "album__name")
+    search_fields = ("title", "album__artist__name", "album__name")
-    list_filter = ("artist__name",)
+    list_filter = ("album__artist__name",)
+
+
+class TrackInline(admin.TabularInline):
+    model = Track
+    extra = 1
+    show_change_link = True
+
+    def has_change_permission(
+        self, request: HttpRequest, obj: Any | None = None
+    ) -> bool:
+        return False
+
+    def has_add_permission(self, request: HttpRequest, obj: Any | None = None) -> bool:
+        return False
 
 
 @admin.register(Album)
@@ -21,9 +38,44 @@ class AlbumAdmin(admin.ModelAdmin):
     list_display = ("artist__name", "name")
     search_fields = ("artist__name", "name")
     list_filter = ("artist__name",)
+    inlines = [TrackInline]
+    readonly_fields = ("add_music_track_link",)
+
+    def add_music_track_link(self, obj: Any | None) -> str:
+        if obj is None or not obj.pk:
+            return ""
+        url = reverse("admin:music_track_add") + f"?album={obj.pk}"
+        return format_html('<a class="button" href="{}">Add Music Track</a>', url)
+
+    add_music_track_link.short_description = "Add Music Track"
+
+
+class AlbumInline(admin.TabularInline):
+    model = Album
+    extra = 1
+    fields = ("name",)
+    show_change_link = True
+
+    def has_change_permission(
+        self, request: HttpRequest, obj: Any | None = None
+    ) -> bool:
+        return False
+
+    def has_add_permission(self, request: HttpRequest, obj: Any | None = None) -> bool:
+        return False
 
 
 @admin.register(Artist)
 class ArtistAdmin(admin.ModelAdmin):
     list_display = ("name",)
     search_fields = ("name",)
+    inlines = [AlbumInline]
+    readonly_fields = ("add_album_link",)
+
+    def add_album_link(self, obj: Any | None) -> str:
+        if obj is None or not obj.pk:
+            return ""
+        url = reverse("admin:music_album_add") + f"?artist={obj.pk}"
+        return format_html('<a class="button" href="{}">Add Album</a>', url)
+
+    add_album_link.short_description = "Add Album"

music_storage/music/migrations/0002_remove_track_artist.py

@@ -0,0 +1,17 @@
+# Generated by Django 6.0 on 2026-01-01 21:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('music', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='track',
+            name='artist',
+        ),
+    ]

music_storage/music/models.py

@@ -19,9 +19,8 @@ class Album(BaseModel):
 
 class Track(BaseModel):
     title = models.CharField(max_length=200)
-    artist = models.ForeignKey(Artist, on_delete=models.CASCADE)
     album = models.ForeignKey(Album, blank=True, null=True, default=None, on_delete=models.SET_DEFAULT)
     file = models.FileField(upload_to="music/")
 
     def __str__(self):
-        return f"{self.artist} - {self.title}"
+        return f"{self.album.artist} - {self.title}"

music_storage/music/views.py

@@ -10,7 +10,7 @@ from music.models import Album
 
 class TrackListView(django_views.View):
     def get(self, request: HttpRequest, *args, **kwargs):
-        tracks = Track.objects.all()
+        tracks = Track.objects.all().select_related("album__artist",)
         return render(request, "music/track_list.html", {"tracks": tracks})
 
 

music_storage/templates/music/track_list.html

@@ -295,7 +295,7 @@
                 <li class="track-item" data-track-id="{{ track.id }}" data-track-src="{{ track.file.url }}">
                     <div class="track-info">
                         <h3 class="track-title">{{ track.title }}</h3>
-                        <p class="track-artist">Исполнитель: {{ track.artist }}</p>
+                        <p class="track-artist">Исполнитель: {{ track.album.artist }}</p>
                     </div>
                 </li>
                 {% endfor %}