From 7387b01869ec2e2c973ed83c52ebad1a2d96428a Mon Sep 17 00:00:00 2001 From: okhin Date: Thu, 14 Sep 2017 12:15:36 +0200 Subject: [PATCH] Update admin.py --- picampaign/campaign/admin.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/picampaign/campaign/admin.py b/picampaign/campaign/admin.py index b229db1..0b19dd1 100644 --- a/picampaign/campaign/admin.py +++ b/picampaign/campaign/admin.py @@ -33,11 +33,12 @@ class CampaignAdmin(TranslationAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == "organization": if request.user.is_superuser: - kwargs["queryset"] = Organization.objects.all() + orgs = Organization.objects.all() else: - query = {'id__in': [x.id - for x in request.user.organizations.all()]} - kwargs["queryset"] = Organization.objects.filter(**query) + orgs = request.user.organizations.all() + query = {'id__in': [x.id + for x in orgs]} + kwargs["queryset"] = Organization.objects.filter(**query) return super(CampaignAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) @@ -69,7 +70,10 @@ class ArgumentaryAdmin(TranslationAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == "campaign": - orgs = request.user.organizations.all() + if request.user.is_superuser: + orgs = Organization.objects.all() + else: + orgs = request.user.organizations.all() query = {'organization__in': orgs} kwargs["queryset"] = Campaign.objects.filter(**query) return super(ArgumentaryAdmin, self).formfield_for_foreignkey(db_field, -- 2.21.0