github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 08:19:04 +00:00
Code Issues Projects Releases Wiki Activity

refactor: 重构用户授权资产查询工具(重构中..) (#9225)

Browse Source 
* refactor: 重构用户授权资产查询工具(重构中..)

* perf: 修改 get_perm_nodes_assets 名称

* refactor: 优化用户授权节点查询工具; 删除UnionQuerySet工具

Co-authored-by: Bai <baijiangjie@gmail.com>
This commit is contained in:
fit2bot
2022-12-21 17:36:44 +08:00
committed by GitHub
parent 510ca9a5b8
commit 34cc3b233d
11 changed files with 269 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/perms/filters.py
View File

@@ -1,7 +1,6 @@
from django_filters import rest_framework as filters
from django.db.models import QuerySet, Q
from common.db.models import UnionQuerySet
from common.drf.filters import BaseFilterSet
from common.utils import get_object_or_none
from users.models import User, UserGroup
@@ -169,10 +168,10 @@ class AssetPermissionFilter(PermissionBaseFilter):
inherit_all_node_ids = Node.objects.filter(key__in=inherit_all_node_keys).values_list('id', flat=True)
inherit_all_node_ids = list(inherit_all_node_ids)
qs1 = queryset.filter(assets__in=asset_ids).distinct()
qs2 = queryset.filter(nodes__in=inherit_all_node_ids).distinct()
qs = UnionQuerySet(qs1, qs2)
qs1_ids = queryset.filter(assets__in=asset_ids).distinct().values_list('id', flat=True)
qs2_ids = queryset.filter(nodes__in=inherit_all_node_ids).distinct().values_list('id', flat=True)
qs_ids = list(qs1_ids) + list(qs2_ids)
qs = queryset.filter(id__in=qs_ids)
return qs
def filter_effective(self, queryset):