github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/2874/head
ibuler 2019-07-02 16:47:10 +08:00
parent 930eb1d2e1 98260b5b52
commit 58182712a2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perms/api/user_permission.py
View File

@ -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):

2
apps/terminal/utils.py
View File

@ -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():