From 2c413e8d51473b17d904cd88455472965fd10450 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 6 Jun 2018 10:49:16 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=BC=95=E8=B5=B7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/perms/utils.py b/apps/perms/utils.py index 475acfb68..7ff64b00d 100644 --- a/apps/perms/utils.py +++ b/apps/perms/utils.py @@ -14,7 +14,7 @@ logger = get_logger(__file__) def get_user_permissions(user, include_group=True): if include_group: groups = user.groups.all() - arg = Q(users=user) | Q(user_groups=groups) + arg = Q(users=user) | Q(user_groups__in=groups) else: arg = Q(users=user) 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): if include_node: nodes = asset.get_all_nodes(flat=True) - arg = Q(assets=asset) | Q(nodes=nodes) + arg = Q(assets=asset) | Q(nodes__in=nodes) else: arg = Q(assets=asset) return AssetPermission.objects.all().valid().filter(arg)