Merge branch 'marietje-zuid' into 'dsprenkels/songs-reportnote-filter'

# Conflicts:
#   marietje/songs/admin.py

.gitlab-ci.yml

@@ -9,7 +9,7 @@ pylint:
         - apt-get -qq install -y python3 python3-venv python3-pip
         - python3 -m venv venv
         - source venv/bin/activate
-        - pip install -r requirements.txt pylint
+        - pip install -r requirements.txt
     script:
         - pylint marietje/marietje marietje/metrics marietje/playerapi marietje/queues marietje/songs marietje/stats
 

marietje/songs/admin.py

@@ -1,5 +1,7 @@
 from django.contrib import admin
 from django.db.models import Count
+from django.urls import reverse
+from django.utils.html import format_html
 
 from .models import ReportNote, Song
 
@@ -53,6 +55,14 @@ class SongAdmin(admin.ModelAdmin):
 
 @admin.register(ReportNote)
 class ReportNoteAdmin(admin.ModelAdmin):
+    exclude = ('song',)
     list_display = ('song', 'note', 'user')
     search_fields = ('song__artist', 'song__title', 'user__name')
-    readonly_fields = ('song',)
+    readonly_fields = ('song_link',)
+
+    @staticmethod
+    def song_link(note):
+        url = reverse("admin:songs_song_change", args=(note.song.id,))
+        return format_html("<a href='{url}'>{song}</a>", url=url, song=note.song)
+
+    song_link.short_description = "Song link"

requirements.txt

@@ -2,3 +2,4 @@ django>=2.2,<2.3
 mutagen
 argon2-cffi
 prometheus_client
+pylint==2.5.3