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

[Bugfix] 修复授权列表用户无法搜索的bug

pull/3100/head
ibuler 2019-08-08 18:32:44 +08:00
parent fbfbfcc274
commit 785b375f4a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/perms/api/asset_permission.py
View File

@ -115,6 +115,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
def filter_user(self, queryset): def filter_user(self, queryset):
user_id = self.request.query_params.get('user_id') user_id = self.request.query_params.get('user_id')
username = self.request.query_params.get('username') username = self.request.query_params.get('username')
query_group = self.request.query_params.get('all')
if user_id: if user_id:
user = get_object_or_none(User, pk=user_id) user = get_object_or_none(User, pk=user_id)
elif username: elif username:
@ -123,6 +124,15 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
return queryset return queryset
if not user: if not user:
return queryset.none() return queryset.none()
else:
kwargs = {}
args = []
if query_group:
groups = user.groups.all()
args.append(Q(users=user) | Q(user_groups__in=groups))
else:
kwargs["users"] = user
return queryset.filter(*args, **kwargs).distinct()
def filter_user_group(self, queryset): def filter_user_group(self, queryset):
user_group_id = self.request.query_params.get('user_group_id') user_group_id = self.request.query_params.get('user_group_id')
@ -148,6 +158,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
def filter_queryset(self, queryset): def filter_queryset(self, queryset):
queryset = super().filter_queryset(queryset) queryset = super().filter_queryset(queryset)
queryset = self.filter_valid(queryset) queryset = self.filter_valid(queryset)
queryset = self.filter_user(queryset)
queryset = self.filter_keyword(queryset) queryset = self.filter_keyword(queryset)
queryset = self.filter_asset(queryset) queryset = self.filter_asset(queryset)
queryset = self.filter_node(queryset) queryset = self.filter_node(queryset)