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

fix(perms): 修复失效资产授权action 还在的问题

pull/4783/head^2
xinwen 2020-10-13 19:04:26 +08:00
parent a57ce482dd
commit f3d052554d
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/asset_permission.py
View File

@ -37,12 +37,12 @@ def get_asset_system_users_id_with_actions(asset_perm_queryset: BasePermissionQu
def get_asset_system_users_id_with_actions_by_user(user: User, asset: Asset): def get_asset_system_users_id_with_actions_by_user(user: User, asset: Asset):
queryset = AssetPermission.objects.filter( queryset = AssetPermission.objects.filter(
Q(users=user) | Q(user_groups__users=user) Q(users=user) | Q(user_groups__users=user)
) ).valid()
return get_asset_system_users_id_with_actions(queryset, asset) return get_asset_system_users_id_with_actions(queryset, asset)
def get_asset_system_users_id_with_actions_by_group(group: UserGroup, asset: Asset): def get_asset_system_users_id_with_actions_by_group(group: UserGroup, asset: Asset):
queryset = AssetPermission.objects.filter( queryset = AssetPermission.objects.filter(
user_groups=group user_groups=group
) ).valid()
return get_asset_system_users_id_with_actions(queryset, asset) return get_asset_system_users_id_with_actions(queryset, asset)