MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import - org_id in params for childs & org linked ranchers

Browse Source
This commit is contained in:
Mojtaba-z
2025-12-23 12:23:00 +03:30
parent 0937d1f3ca
commit 5286eb540f
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/authentication/api/v1/api.py
View File

@@ -376,11 +376,15 @@ class OrganizationViewSet(BaseViewSet, ModelViewSet, DynamicSearchMixin):
@transaction.atomic @transaction.atomic
def get_child_organizations(self, request): def get_child_organizations(self, request):
organization = get_organization_by_user(request.user) organization = get_organization_by_user(request.user)
child_organizations = self.get_all_org_child(organization) query_params = self.request.query_params # noqa
# search & filter # search & filter
queryset = self.filter_query( if not 'org_id' in query_params.keys(): # noqa
self.get_queryset() queryset = self.filter_query(
) if not 'org_id' in self.request.query_params.keys() else self.get_all_org_child(organization) self.get_queryset()
)
else:
queryset = self.get_all_org_child(Organization.objects.get(id=query_params.get('org_id')))
page = self.paginate_queryset(queryset) # paginate queryset page = self.paginate_queryset(queryset) # paginate queryset

7
apps/herd/web/api/v1/api.py
View File

@@ -302,7 +302,12 @@ class RancherOrganizationLinkViewSet(
""" """
list of organizations with rancher information list of organizations with rancher information
""" """
org = get_organization_by_user(request.user) query_params = self.request.query_params # noqa
if not 'org_id' in query_params.keys():
org = get_organization_by_user(request.user)
else:
org = Organization.objects.get(id=query_params.get('org_id'))
result = self.orgs_linked_rancher(org=org, org_type_key='CO') result = self.orgs_linked_rancher(org=org, org_type_key='CO')
page = self.paginate_queryset(result) # paginate queryset page = self.paginate_queryset(result) # paginate queryset