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

fix - org linked rancher list pagination bug

Browse Source
This commit is contained in:
Mojtaba-z
2025-12-23 11:50:37 +03:30
parent 846e57dd41
commit 0937d1f3ca
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,10 +377,10 @@ class OrganizationViewSet(BaseViewSet, ModelViewSet, DynamicSearchMixin):
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) child_organizations = self.get_all_org_child(organization)
# search & filter # search & filter
queryset = self.filter_query( queryset = self.filter_query(
self.get_queryset()) self.get_queryset()
) if not 'org_id' in self.request.query_params.keys() else self.get_all_org_child(organization)
page = self.paginate_queryset(queryset) # paginate queryset page = self.paginate_queryset(queryset) # paginate queryset

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

@@ -306,7 +306,9 @@ class RancherOrganizationLinkViewSet(
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
return self.get_paginated_response(result) if page is not None:
return self.get_paginated_response(page)
return Response(result)
@action( @action(
methods=['get'], methods=['get'],