From 4eef25982dd74158438b61da69d8ded67b500dd9 Mon Sep 17 00:00:00 2001 From: Bai Date: Thu, 27 May 2021 18:42:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20ApplicationUserLis?= =?UTF-8?q?t=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/applications/api/application.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/applications/api/application.py b/apps/applications/api/application.py index b4255b426..93caa97d1 100644 --- a/apps/applications/api/application.py +++ b/apps/applications/api/application.py @@ -26,6 +26,8 @@ class ApplicationViewSet(OrgBulkModelViewSet): class ApplicationUserListApi(generics.ListAPIView): permission_classes = (IsOrgAdmin, ) + filterset_fields = ('name', 'username') + search_fields = filterset_fields serializer_class = SystemUserListSerializer def get_application(self): @@ -40,8 +42,8 @@ class ApplicationUserListApi(generics.ListAPIView): application = self.get_application() if not application: return queryset - if application.category == ApplicationCategoryChoices.remote_app: - return queryset + # if application.category == ApplicationCategoryChoices.remote_app: + # return queryset system_user_ids = ApplicationPermission.objects.filter(applications=application)\ .values_list('system_users', flat=True) if not system_user_ids: