diff --git a/apps/perms/api/user_permission.py b/apps/perms/api/user_permission.py index cf259fb4f..666b7f55a 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): 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():