fix(access): org mixin get_obj_org not to call get_object

ref: #471 #511
2025-02-01 16:58:39 +09:30
parent b6593c6825
commit a4788aba75
1 changed files with 10 additions and 1 deletions
--- a/app/access/mixins/organization.py
+++ b/app/access/mixins/organization.py
@ -78,7 +78,16 @@ class OrganizationMixin:

        elif self.kwargs.get('pk', None):

-            self._obj_organization = self.get_object().organization
+
+            obj = self.model.objects.get( pk = self.kwargs.get('pk', None) )
+
+            if getattr(obj, 'organization', None):
+
+                self._obj_organization = obj.organization
+
+            elif str(self.model._meta.verbose_name).lower() == 'organization':
+
+                self._obj_organization = obj


        if self.get_parent_model():    # if defined is to overwrite object organization