mirror of https://github.com/jumpserver/jumpserver
[Bugfix] 修复授权列表用户无法搜索的bug
parent
fbfbfcc274
commit
785b375f4a
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue