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

[Update] 修改获取禁用资产的问题 (#2901)

pull/2902/head
老广 2019-07-08 15:52:03 +08:00 committed by GitHub
parent 033b44f9d2
commit 6330f2d42d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perms/utils/asset_permission.py
View File

@ -493,7 +493,7 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
pattern.add(r'^{0}$|^{0}:'.format(node.key)) pattern.add(r'^{0}$|^{0}:'.format(node.key))
pattern = '|'.join(list(pattern)) pattern = '|'.join(list(pattern))
if pattern: if pattern:
assets = Asset.objects.filter(nodes__key__regex=pattern) \ assets = Asset.objects.filter(nodes__key__regex=pattern).valid() \
.prefetch_related('nodes')\ .prefetch_related('nodes')\
.only(*self.assets_only)\ .only(*self.assets_only)\
.distinct() .distinct()