From 9a3065ad4c8931162d32d9f3b0e64c6b9021de63 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Tue, 2 Jul 2019 16:01:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Bugfix]=20=E4=BC=9A=E8=AF=9D/=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E5=88=97=E8=A1=A8=E4=B8=AD=E8=8E=B7=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=92=E9=99=A4app=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/terminal/utils.py b/apps/terminal/utils.py index 143625d44..d7dace0a9 100644 --- a/apps/terminal/utils.py +++ b/apps/terminal/utils.py @@ -13,7 +13,7 @@ def get_session_asset_list(): def get_session_user_list(): - return User.objects.values_list('username', flat=True) + return User.objects.exclude(role=User.ROLE_APP).values_list('username', flat=True) def get_session_system_user_list(): From 98260b5b526a574a32c5f9b309aee8e18717d5c8 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Tue, 2 Jul 2019 16:34:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8E=88=E6=9D=83=E8=B5=84=E4=BA=A7API=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=9A=84queryset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api/user_permission.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/perms/api/user_permission.py b/apps/perms/api/user_permission.py index ca583c388..2a2272536 100644 --- a/apps/perms/api/user_permission.py +++ b/apps/perms/api/user_permission.py @@ -158,7 +158,7 @@ class UserGrantedAssetsApi(UserPermissionCacheMixin, AssetsFilterMixin, ListAPIV system_user.actions = actions system_users_granted.append(system_user) asset.system_users_granted = system_users_granted - queryset.append(system_users_granted) + queryset.append(asset) return queryset def get_permissions(self):