fix - org linked rancher list pagination bug
This commit is contained in:
@@ -377,10 +377,10 @@ class OrganizationViewSet(BaseViewSet, ModelViewSet, DynamicSearchMixin):
|
||||
def get_child_organizations(self, request):
|
||||
organization = get_organization_by_user(request.user)
|
||||
child_organizations = self.get_all_org_child(organization)
|
||||
|
||||
# search & filter
|
||||
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
|
||||
|
||||
|
||||
@@ -306,7 +306,9 @@ class RancherOrganizationLinkViewSet(
|
||||
result = self.orgs_linked_rancher(org=org, org_type_key='CO')
|
||||
|
||||
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(
|
||||
methods=['get'],
|
||||
|
||||
Reference in New Issue
Block a user