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

fix: 修复用户绑定角色重大bug

pull/7957/head
feng626 2022-03-22 16:14:25 +08:00 committed by 老广
parent a1976e4f0b
commit ddbcbb0d66
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/users/models/user.py
View File

@ -237,16 +237,16 @@ class RoleManager(models.Manager):
class OrgRoleManager(RoleManager): class OrgRoleManager(RoleManager):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
from rbac.const import Scope from rbac.const import Scope
self.scope = Scope.org self.scope = Scope.org
super().__init__(*args, **kwargs)
class SystemRoleManager(RoleManager): class SystemRoleManager(RoleManager):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
from rbac.const import Scope from rbac.const import Scope
self.scope = Scope.system self.scope = Scope.system
super().__init__(*args, **kwargs)
class RoleMixin: class RoleMixin:

2
apps/users/serializers/user.py
View File

@ -49,6 +49,8 @@ class RolesSerializerMixin(serializers.Serializer):
return fields return fields
action = view.action or 'list' action = view.action or 'list'
if action in ('partial_bulk_update', 'bulk_update', 'partial_update', 'update'):
action = 'create'
model_cls_field_mapper = { model_cls_field_mapper = {
SystemRoleBinding: ['system_roles', 'system_roles_display'], SystemRoleBinding: ['system_roles', 'system_roles_display'],
OrgRoleBinding: ['org_roles', 'system_roles_display'] OrgRoleBinding: ['org_roles', 'system_roles_display']