mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-01-29 21:51:31 +00:00
refactor: 整合系统用户和管理用户 (#6236)
* perf: 整合系统用户和管理用户 * stash stash perf: 优化系统用户和资产的表结构 * perf: 添加信号 * perf: 添加算法 * perf: 去掉 asset user backends * perf: 整理系统用户api * perfF: 暂存一下 * stash * perf: 暂存一下 * perf: 暂存 * xxx * perf: ... * stash it * xxx * xxx * xxx * xxx * xxx * stash it * 修改Protocols * perf: 修改创建authbook信号 * perf: 添加auth info * .stash * perf: 基本完成 * perf: 修复完成 * perf: 修复更改的id * perf: 修复迁移过去数量不对的问题 * perf: 修改systemuser * fix: 修复批量编辑近期的问题 * fix: 修复authbook加载的问题 * xxx Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
@@ -23,7 +23,7 @@ from orgs.models import OrganizationMember, Organization
|
||||
from common.utils import date_expired_default, get_logger, lazyproperty, random_string
|
||||
from common import fields
|
||||
from common.const import choices
|
||||
from common.db.models import ChoiceSet
|
||||
from common.db.models import TextChoices
|
||||
from users.exceptions import MFANotEnabled
|
||||
from ..signals import post_user_change_password
|
||||
|
||||
@@ -170,7 +170,7 @@ class AuthMixin:
|
||||
|
||||
|
||||
class RoleMixin:
|
||||
class ROLE(ChoiceSet):
|
||||
class ROLE(TextChoices):
|
||||
ADMIN = choices.ADMIN, _('System administrator')
|
||||
AUDITOR = choices.AUDITOR, _('System auditor')
|
||||
USER = choices.USER, _('User')
|
||||
|
||||
Reference in New Issue
Block a user