Skip to content

J
jumpserver
Commit 58182712 authored by ibuler's avatar ibuler
Browse files
Options

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

parents 930eb1d2 98260b5b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
apps/perms/api/user_permission.py
View file @ 58182712
...@@ -158,7 +158,7 @@ class UserGrantedAssetsApi(UserPermissionCacheMixin, AssetsFilterMixin, ListAPIV ...@@ -158,7 +158,7 @@ class UserGrantedAssetsApi(UserPermissionCacheMixin, AssetsFilterMixin, ListAPIV
system_user.actions = actions system_user.actions = actions
system_users_granted.append(system_user) system_users_granted.append(system_user)
asset.system_users_granted = system_users_granted asset.system_users_granted = system_users_granted
queryset.append(system_users_granted) queryset.append(asset)
return queryset return queryset
def get_permissions(self): def get_permissions(self):
......
apps/terminal/utils.py
View file @ 58182712
...@@ -13,7 +13,7 @@ def get_session_asset_list(): ...@@ -13,7 +13,7 @@ def get_session_asset_list():
def get_session_user_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(): def get_session_system_user_list():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment