Merge pull request #512 from maykinmedia/fix/timelinelog-uix

Added two list-filters to TimelineLog admin for better usability

Author: alextreme

src/open_inwoner/utils/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
 from django.contrib.admin.models import ADDITION, CHANGE, DELETION
+from django.contrib.contenttypes.models import ContentType
 from django.urls import NoReverseMatch, reverse
 from django.utils.html import escape, format_html
 from django.utils.translation import gettext as _
@@ -10,6 +11,47 @@
 from timeline_logger.models import TimelineLog
 from timeline_logger.resources import TimelineLogResource
 
+from open_inwoner.utils.logentry import LOG_ACTIONS
+
+
+class LogActionListFilter(admin.SimpleListFilter):
+    title = _("Actie")
+    parameter_name = "log_action"
+
+    def lookups(self, request, model_admin):
+        return list(LOG_ACTIONS.values())
+
+    def queryset(self, request, queryset):
+        v = self.value()
+        if v:
+            try:
+                v = int(v)
+            except ValueError:
+                pass
+            else:
+                queryset = queryset.filter(extra_data__action_flag__0=v)
+        return queryset
+
+
+class ContentTypeUsedListFilter(admin.SimpleListFilter):
+    title = _("content type")
+    parameter_name = "ct"
+
+    def lookups(self, request, model_admin):
+        qs = model_admin.get_queryset(request)
+        content_types = ContentType.objects.filter(
+            id__in=qs.values_list("content_type", flat=True).distinct()
+        )
+        return [("none", "None")] + [(ct.id, str(ct)) for ct in content_types]
+
+    def queryset(self, request, queryset):
+        v = self.value()
+        if v:
+            if v == "none":
+                v = None
+            queryset = queryset.filter(content_type=v)
+        return queryset
+
 
 class CustomTimelineLogAdmin(ExportMixin, TimelineLogAdmin):
     show_full_result_count = False
@@ -23,7 +65,7 @@ class CustomTimelineLogAdmin(ExportMixin, TimelineLogAdmin):
         "get_action_flag",
         "message",
     ]
-    list_filter = ["timestamp", "content_type"]
+    list_filter = ["timestamp", LogActionListFilter, ContentTypeUsedListFilter]
     list_select_related = ["content_type"]
     search_fields = [
         "user__email",