github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-10 11:49:10 +00:00
Code Issues Projects Releases Wiki Activity

fix(users): 替换旧有角色常量

Browse Source
This commit is contained in:
xinwen
2020-07-28 17:53:01 +08:00
committed by 老广
parent de3865fa1d
commit b331730422
10 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/users/forms/user.py
View File

@@ -60,9 +60,9 @@ class UserCreateUpdateFormMixin(OrgModelForm):
roles = []
# Super admin user
if self.request.user.is_superuser:
roles.append((User.ROLE_ADMIN, dict(User.ROLE_CHOICES).get(User.ROLE_ADMIN)))
roles.append((User.ROLE_USER, dict(User.ROLE_CHOICES).get(User.ROLE_USER)))
roles.append((User.ROLE_AUDITOR, dict(User.ROLE_CHOICES).get(User.ROLE_AUDITOR)))
roles.append((User.ROLE.ADMIN, User.ROLE.ADMIN.label))
roles.append((User.ROLE.USER, User.ROLE.USER.label))
roles.append((User.ROLE.AUDITOR, User.ROLE.AUDITOR.label))
# Org admin user
else:
@@ -70,10 +70,10 @@ class UserCreateUpdateFormMixin(OrgModelForm):
# Update
if user:
role = kwargs.get('instance').role
roles.append((role, dict(User.ROLE_CHOICES).get(role)))
roles.append((role, User.ROLE[role]))
# Create
else:
roles.append((User.ROLE_USER, dict(User.ROLE_CHOICES).get(User.ROLE_USER)))
roles.append((User.ROLE.USER, User.ROLE.USER.label))
field = self.fields['role']
field.choices = set(roles)