From 8f1c934f730514e79edfddee70800c050f42e6eb Mon Sep 17 00:00:00 2001 From: Michael Bai Date: Mon, 13 Sep 2021 20:08:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=88=E6=9D=83=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87=20from=5Fticket=20?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api/application/application_permission.py | 1 + apps/perms/filters.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/perms/api/application/application_permission.py b/apps/perms/api/application/application_permission.py index a97665d53..9c3eb18b4 100644 --- a/apps/perms/api/application/application_permission.py +++ b/apps/perms/api/application/application_permission.py @@ -16,6 +16,7 @@ class ApplicationPermissionViewSet(BasePermissionViewSet): 'name': ['exact'], 'category': ['exact'], 'type': ['exact', 'in'], + 'from_ticket': ['exact'] } search_fields = ['name', 'category', 'type'] custom_filter_fields = BasePermissionViewSet.custom_filter_fields + [ diff --git a/apps/perms/filters.py b/apps/perms/filters.py index adf4c8404..f56927436 100644 --- a/apps/perms/filters.py +++ b/apps/perms/filters.py @@ -21,8 +21,8 @@ class PermissionBaseFilter(BaseFilterSet): class Meta: fields = ( - 'user_id', 'username', 'system_user_id', 'system_user', 'user_group_id', - 'user_group', 'name', 'all', 'is_valid', + 'user_id', 'username', 'system_user_id', 'system_user', + 'user_group_id', 'user_group', 'name', 'all', 'is_valid', ) @property @@ -118,7 +118,7 @@ class AssetPermissionFilter(PermissionBaseFilter): fields = ( 'user_id', 'username', 'system_user_id', 'system_user', 'user_group_id', 'user_group', 'node_id', 'node', 'asset_id', 'hostname', 'ip', 'name', - 'all', 'asset_id', 'is_valid', 'is_effective', + 'all', 'asset_id', 'is_valid', 'is_effective', 'from_ticket' ) @property