github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-19 18:34:28 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复收藏文件夹中的资产时不时莫名的丢失 (#12886)

Browse Source 
Co-authored-by: feng <1304903146@qq.com>
This commit is contained in:
fit2bot
2024-03-27 16:04:16 +08:00
committed by GitHub
parent f0cbd77310
commit 3aeadc2f03
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/perms/utils/user_perm.py
View File

@@ -9,7 +9,7 @@ from rest_framework.utils.encoders import JSONEncoder
from assets.const import AllTypes
from assets.models import FavoriteAsset, Asset, Node
from common.utils.common import timeit, get_logger
from orgs.utils import current_org, tmp_to_root_org
from orgs.utils import current_org
from perms.models import PermNode, UserAssetGrantedTreeNodeRelation, AssetPermission
from .permission import AssetPermissionUtil
@@ -112,11 +112,10 @@ class UserPermAssetUtil(AssetPermissionPermAssetUtil):
favor_ids = FavoriteAsset.objects.filter(user=self.user).values_list('asset_id', flat=True)
favor_ids = set(favor_ids)
with tmp_to_root_org():
valid_ids = self.get_all_assets() \
.filter(id__in=favor_ids) \
.values_list('id', flat=True)
valid_ids = set(valid_ids)
valid_ids = self.get_all_assets() \
.filter(id__in=favor_ids) \
.values_list('id', flat=True)
valid_ids = set(valid_ids)
invalid_ids = favor_ids - valid_ids
FavoriteAsset.objects.filter(user=self.user, asset_id__in=invalid_ids).delete()