From 3835adafb8c49569a21a93ec58474283629f484d Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 11 Apr 2018 12:13:49 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/perms/api.py b/apps/perms/api.py index 4f4fa3145..1303e4128 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -114,8 +114,12 @@ class UserGrantedNodesWithAssetsApi(ListAPIView): nodes = AssetPermissionUtil.get_user_nodes_with_assets(user) for node, _assets in nodes.items(): assets = _assets.keys() - for asset, system_users in _assets.items(): - asset.system_users_granted = system_users + for k, v in _assets.items(): + if k.is_unixlike(): + system_users_granted = [s for s in v if s.protocol == 'ssh'] + else: + system_users_granted = [s for s in v if s.protocol == 'rdp'] + k.system_users_granted = system_users_granted node.assets_granted = assets queryset.append(node) return queryset