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

[Bugfix] 修复权限查看引起的bug

pull/1401/head
ibuler 2018-06-06 10:49:16 +08:00
parent 482d1bb27f
commit 2c413e8d51
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/perms/utils.py
View File

@ -14,7 +14,7 @@ logger = get_logger(__file__)
def get_user_permissions(user, include_group=True): def get_user_permissions(user, include_group=True):
if include_group: if include_group:
groups = user.groups.all() groups = user.groups.all()
arg = Q(users=user) | Q(user_groups=groups) arg = Q(users=user) | Q(user_groups__in=groups)
else: else:
arg = Q(users=user) arg = Q(users=user)
return AssetPermission.objects.all().valid().filter(arg) return AssetPermission.objects.all().valid().filter(arg)
@ -29,7 +29,7 @@ def get_user_group_permissions(user_group):
def get_asset_permissions(asset, include_node=True): def get_asset_permissions(asset, include_node=True):
if include_node: if include_node:
nodes = asset.get_all_nodes(flat=True) nodes = asset.get_all_nodes(flat=True)
arg = Q(assets=asset) | Q(nodes=nodes) arg = Q(assets=asset) | Q(nodes__in=nodes)
else: else:
arg = Q(assets=asset) arg = Q(assets=asset)
return AssetPermission.objects.all().valid().filter(arg) return AssetPermission.objects.all().valid().filter(arg)