Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix

5 years ago · 58182712a2
parent 930eb1d2e1 98260b5b52
commit 58182712a2
2 changed files with 2 additions and 2 deletions
--- 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):
--- 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():