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

Merge branch 'v3' of github.com:jumpserver/jumpserver into v3

pull/9221/head
ibuler 2022-12-20 13:49:56 +08:00
parent c040564dc2 1b82f3fc6a
commit 5d31200368
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/perms/utils/user_permission.py
View File

@ -54,12 +54,9 @@ class UserGrantedUtilsBase:
class UserGrantedAssetsQueryUtils(UserGrantedUtilsBase): class UserGrantedAssetsQueryUtils(UserGrantedUtilsBase):
def get_favorite_assets(self) -> QuerySet: def get_favorite_assets(self) -> QuerySet:
favorite_asset_ids = FavoriteAsset.objects.filter(
user=self.user
).values_list('asset_id', flat=True)
favorite_asset_ids = list(favorite_asset_ids)
assets = self.get_all_granted_assets() assets = self.get_all_granted_assets()
assets = assets.filter(id__in=favorite_asset_ids) asset_ids = FavoriteAsset.objects.filter(user=self.user).values_list('asset_id', flat=True)
assets = assets.filter(id__in=list(asset_ids))
return assets return assets
def get_ungroup_assets(self) -> AssetQuerySet: def get_ungroup_assets(self) -> AssetQuerySet:
@ -83,8 +80,13 @@ class UserGrantedAssetsQueryUtils(UserGrantedUtilsBase):
def get_all_granted_assets(self) -> QuerySet: def get_all_granted_assets(self) -> QuerySet:
nodes_assets = self.get_direct_granted_nodes_assets() nodes_assets = self.get_direct_granted_nodes_assets()
assets = self.get_direct_granted_assets() assets = self.get_direct_granted_assets()
queryset = UnionQuerySet(nodes_assets, assets) # queryset = UnionQuerySet(nodes_assets, assets)
return queryset # return queryset
node_asset_ids = nodes_assets.values_list('id', flat=True)
direct_asset_ids = assets.values_list('id', flat=True)
asset_ids = list(node_asset_ids) + list(direct_asset_ids)
asset = Asset.objects.filter(id__in=asset_ids)
return asset
def get_node_all_assets(self, id) -> Tuple[PermNode, QuerySet]: def get_node_all_assets(self, id) -> Tuple[PermNode, QuerySet]:
node = PermNode.objects.get(id=id) node = PermNode.objects.get(id=id)