From aceecb655f58f605af11cfa2f93e21fc82e4c7bc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 22 Nov 2016 11:13:27 +0100 Subject: Fix moderator filtering by category --- chimere/admin.py | 7 +++++-- chimere/tests.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/chimere/admin.py b/chimere/admin.py index 53a3e83..4a540e4 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -347,8 +347,11 @@ class MarkerAdmin(admin.ModelAdmin): main_fields.append(pm_name) return newfieldsets - def queryset(self, request): - qs = self.model._default_manager.get_query_set() + def get_queryset(self, request): + """ + Filter queryset with specific rights + """ + qs = super().get_queryset(request) qs = moderator_right(request.user, qs, geo_type='marker') ordering = self.ordering or () if ordering: diff --git a/chimere/tests.py b/chimere/tests.py index 819782a..9360b76 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -442,7 +442,7 @@ class AdminTest(AdministratorsTest): self.assertFalse(str(self.subcategories[1]) in str(response.content)) response = self.client.get('/admin/chimere/marker/{}/'.format(m_ok.pk)) self.assertEqual(200, response.status_code) - # functionnality currently disabled + # functionality currently disabled # self.assertFalse(str(self.subcategories[1]) in response.content) response = self.client.get( '/admin/chimere/marker/{}/'.format(m_nok.pk)) -- cgit v1.2.3