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

fix - search in page & permissions

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-01 11:26:22 +03:30
parent fc67266d64
commit e52f9abd61
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/authorization/api/v1/api.py
View File

@@ -63,7 +63,7 @@ class PageViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
def list(self, request, *args, **kwargs):
""" all pages """
page = self.paginate_queryset(self.queryset.order_by('-create_date'))
page = self.paginate_queryset(self.filter_queryset(self.queryset.order_by('-modify_date')))
if page is not None: # noqa
serializer = self.get_serializer(page, many=True)
return self.get_paginated_response(serializer.data)
@@ -97,7 +97,7 @@ class PermissionViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
search_fields = ['page__name', ]
def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset().order_by('-create_date')) # noqa
queryset = self.filter_queryset(self.get_queryset().order_by('-modify_date')) # noqa
page = self.paginate_queryset(queryset)
if page is not None:
@@ -133,7 +133,7 @@ class PermissionViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
role_num=Count('role'),
).filter(user_relation_num=0, role_num=0) # noqa
page = self.paginate_queryset(permissions)
page = self.paginate_queryset(self.filter_queryset(permissions))
if page is not None:
serializer = self.get_serializer(page, many=True)
return self.get_paginated_response(serializer.data)