From 124a7c3dcf2fb478ea451dbb4a824683cf11596c Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 20 Mar 2019 20:18:19 +0100
Subject: [PATCH] Fix #767: broken Activity and Actor modules in django admin
---
api/funkwhale_api/federation/admin.py | 6 +++---
changes/changelog.d/767.bugfix | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 changes/changelog.d/767.bugfix
diff --git a/api/funkwhale_api/federation/admin.py b/api/funkwhale_api/federation/admin.py
index acb2e5b67b..8c9bbe31c8 100644
--- a/api/funkwhale_api/federation/admin.py
+++ b/api/funkwhale_api/federation/admin.py
@@ -33,8 +33,8 @@ class DomainAdmin(admin.ModelAdmin):
@admin.register(models.Activity)
class ActivityAdmin(admin.ModelAdmin):
list_display = ["type", "fid", "url", "actor", "creation_date"]
- search_fields = ["payload", "fid", "url", "actor__domain"]
- list_filter = ["type", "actor__domain"]
+ search_fields = ["payload", "fid", "url", "actor__domain__name"]
+ list_filter = ["type", "actor__domain__name"]
actions = [redeliver_activities]
list_select_related = True
@@ -49,7 +49,7 @@ class ActorAdmin(admin.ModelAdmin):
"creation_date",
"last_fetch_date",
]
- search_fields = ["fid", "domain", "preferred_username"]
+ search_fields = ["fid", "domain__name", "preferred_username"]
list_filter = ["type"]
diff --git a/changes/changelog.d/767.bugfix b/changes/changelog.d/767.bugfix
new file mode 100644
index 0000000000..8a2bbdb86c
--- /dev/null
+++ b/changes/changelog.d/767.bugfix
@@ -0,0 +1 @@
+Fixed broken Activity and Actor modules in django admin (#767)
--
GitLab