github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 授权规则支持通过 from_ticket 工单过滤

pull/6827/head
Michael Bai 2021-09-13 20:08:57 +08:00 committed by Jiangjie.Bai
parent 7a45f4d129
commit 8f1c934f73
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/perms/api/application/application_permission.py
View File

@ -16,6 +16,7 @@ class ApplicationPermissionViewSet(BasePermissionViewSet):
'name': ['exact'], 'name': ['exact'],
'category': ['exact'], 'category': ['exact'],
'type': ['exact', 'in'], 'type': ['exact', 'in'],
'from_ticket': ['exact']
} }
search_fields = ['name', 'category', 'type'] search_fields = ['name', 'category', 'type']
custom_filter_fields = BasePermissionViewSet.custom_filter_fields + [ custom_filter_fields = BasePermissionViewSet.custom_filter_fields + [

6
apps/perms/filters.py
View File

@ -21,8 +21,8 @@ class PermissionBaseFilter(BaseFilterSet):
class Meta: class Meta:
fields = ( fields = (
'user_id', 'username', 'system_user_id', 'system_user', 'user_group_id', 'user_id', 'username', 'system_user_id', 'system_user',
'user_group', 'name', 'all', 'is_valid', 'user_group_id', 'user_group', 'name', 'all', 'is_valid',
) )
@property @property
@ -118,7 +118,7 @@ class AssetPermissionFilter(PermissionBaseFilter):
fields = ( fields = (
'user_id', 'username', 'system_user_id', 'system_user', 'user_group_id', 'user_id', 'username', 'system_user_id', 'system_user', 'user_group_id',
'user_group', 'node_id', 'node', 'asset_id', 'hostname', 'ip', 'name', '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 @property