nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

refactor(access): When fetching obj org, if pk exist attempt to fetch object

Browse Source 
ref: #471 #511
This commit is contained in:
Jon Lockwood
2025-02-01 15:30:13 +09:30
parent e5b0ed4c69
commit 22b02dc044
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/access/mixins/organization.py
View File

@ -38,19 +38,19 @@ class OrganizationMixin:
return self._obj_organization
_obj_organization: Organization = None
if obj:
_obj_organization = getattr(obj, 'organization', None)
self._obj_organization = getattr(obj, 'organization', None)
if not _obj_organization:
if not self._obj_organization:
_obj_organization = getattr(obj, 'get_organization', lambda: None)()
self._obj_organization = getattr(obj, 'get_organization', lambda: None)()
elif request:
elif (
request
and not self.kwargs.get('pk', None)
):
if getattr(request.stream, 'method', '') != 'DELETE':
@ -72,23 +72,22 @@ class OrganizationMixin:
if data_organization:
_obj_organization = Organization.objects.get(
self._obj_organization = Organization.objects.get(
pk = int( data_organization )
)
elif self.kwargs.get('pk', None):
self._obj_organization = self.get_object().organization
if self.get_parent_model(): # if defined is to overwrite object organization
parent_obj = self.get_parent_obj()
_obj_organization = parent_obj.get_organization()
self._obj_organization = parent_obj.get_organization()
if _obj_organization:
self._obj_organization = _obj_organization
return self._obj_organization