github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-16 23:38:36 +00:00
Code Issues Projects Releases Wiki Activity

perf: 修改 rbac tree (#7743)

Browse Source 
* perf: 修改 rbac tree

* perf: 修改verbose name

* fix: 修复系统用户

* fix: 还原 xpack

Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
fit2bot
2022-03-07 11:19:03 +08:00
committed by GitHub
parent eb6bddc599
commit a20884e2ad
10 changed files with 123 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/perms/api/application/user_permission/common.py
View File

@@ -28,7 +28,7 @@ __all__ = [
]
class GrantedApplicationSystemUsersMixin(ListAPIView):
class BaseGrantedApplicationSystemUsersApi(ListAPIView):
serializer_class = serializers.ApplicationSystemUserSerializer
only_fields = serializers.ApplicationSystemUserSerializer.Meta.only_fields
user: None
@@ -45,11 +45,11 @@ class GrantedApplicationSystemUsersMixin(ListAPIView):
return system_users
class UserGrantedApplicationSystemUsersApi(RoleAdminMixin, GrantedApplicationSystemUsersMixin):
class UserGrantedApplicationSystemUsersApi(RoleAdminMixin, BaseGrantedApplicationSystemUsersApi):
pass
class MyGrantedApplicationSystemUsersApi(RoleUserMixin, GrantedApplicationSystemUsersMixin):
class MyGrantedApplicationSystemUsersApi(RoleUserMixin, BaseGrantedApplicationSystemUsersApi):
pass

4
apps/perms/api/application/user_permission/mixin.py
View File

@@ -23,6 +23,6 @@ class RoleUserMixin(_RoleUserMixin):
('GET', 'perms.view_myapps'),
)
def get(self, request, *args, **kwargs):
def dispatch(self, *args, **kwargs):
with tmp_to_root_org():
return super().get(request, *args, **kwargs)
return super().dispatch(*args, **kwargs)