nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

feat(access): Enable Objects from global organization to be viewable by user with the permission

Browse Source 
ref: #448 #459
This commit is contained in:
Jon Lockwood
2025-01-03 12:14:26 +09:30
parent 0d5f329146
commit dd72843ffb
5 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,9 +361,19 @@ class OrganizationMixin:
return has_permission
from settings.models.app_settings import AppSettings
app_settings = AppSettings.objects.get(
owner_organization = None
)
for team in self.get_user_teams( user = self.request.user ):
if team.organization.id == int(organization):
if(
team.organization.id == int(organization)
or getattr(app_settings.global_organization, 'id', 0) == int(organization)
):
for permission in team.permissions.all():

6
app/access/mixins/permissions.py
View File

@ -276,6 +276,11 @@ class OrganizationPermissionMixin(
object_organization: int = getattr(view.get_obj_organization( obj = obj ), 'id', None)
from settings.models.app_settings import AppSettings
app_settings = AppSettings.objects.get(
owner_organization = None
)
if object_organization:
@ -283,6 +288,7 @@ class OrganizationPermissionMixin(
object_organization
in view.get_permission_organizations( view.get_permission_required() )
or request.user.is_superuser
or getattr(app_settings.global_organization, 'id', 0) == int(object_organization)
):
return True