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

Merge pull request #2989 from jumpserver/dev_bai 

[Update] 解决授权资产页面资产重复的问题
pull/2990/head
BaiJiangJie 2019-07-18 13:57:05 +08:00 committed by GitHub
parent fc01b952b3 ce1bb66f23
commit 1f5cc1eef1
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/models/asset_permission.py
View File

@ -103,7 +103,7 @@ class AssetPermission(BasePermission):
if pattern: if pattern:
args.append(Q(nodes__key__regex=pattern)) args.append(Q(nodes__key__regex=pattern))
args = reduce(lambda x, y: x | y, args) args = reduce(lambda x, y: x | y, args)
assets = Asset.objects.filter(args) assets = Asset.objects.filter(args).distinct()
return assets return assets