Merge branch...

Merge branch '21-an-organization-does-not-appears-in-the-selectable-one-for-a-campaign' into 'master'

Resolve "An organization does not appears in the selectable one for a campaign`"

Closes #21

See merge request !11

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,