[Bug] Include the objects with org=None, while filtering serilaizer fileds based on the organization of an user

https://github.com/openwisp/openwisp-users/blob/747ac34ac59c7fee843f8ad250cc5d12292c722b/openwisp_users/api/mixins.py#L137-L140

@nemesisdesign , @atb00ker with this line of code we are trying to filter out other ForeignKey related field other than organization field, based on the organization of a user, But mostly all of such fields has an option to create objects as shared org(organization=None). eg.:- templates, CA, etc… But this LOC only returns the object belonging to an organization, excluding the objects whose organization is set to None.

Will it not be better, if we include the shared objects along with these.

CC: @Purhan

[nemesisdesign]

@ManishShah120 yes sorry my suggestion pointed to the wrong class but I believe you can use almost the exact same code. Try to use “in” instead of chaining several “or”, the result is easier to read.

You’re looping over the organizations and chaining several “or”, but can be done simply by adding None to the organization_filter list. It should be possible to disable this since it’s not required in every serializer. Please follow the suggestion I’ve given above.

[nemesisdesign]

@ManishShah120 @atb00ker @Purhan what do you think about something like the following:

diff --git a/openwisp_users/api/mixins.py b/openwisp_users/api/mixins.py
index 992223f..87fdfa2 100644
--- a/openwisp_users/api/mixins.py
+++ b/openwisp_users/api/mixins.py
@@ -14,6 +14,7 @@ class FilterByOrganization:
 
     permission_classes = [IsAuthenticated]
     organization_lookup = 'organization__in'
+    filter_shared = False
 
     @property
     def _user_attr(self):
@@ -26,8 +27,11 @@ class FilterByOrganization:
         return self.get_organization_queryset(qs)
 
     def get_organization_queryset(self, qs):
+        organization_list = getattr(self.request.user, self._user_attr)
+        if self.filter_shared:
+            organization_list = organization_list + [None]
         return qs.filter(
-            **{self.organization_lookup: getattr(self.request.user, self._user_attr)}
+            **{self.organization_lookup: organization_list}
         )