feat: 用户详情页面显示 手机号,钉钉,企业微信,飞书

pull/6876/head
xinwen 2021-09-15 18:20:38 +08:00 committed by 老广
parent 0c96df5283
commit 7560b70c4d
5 changed files with 26 additions and 25 deletions

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n" "Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-15 19:13+0800\n" "POT-Creation-Date: 2021-09-15 19:29+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -1240,13 +1240,13 @@ msgstr "认证令牌"
#: audits/signals_handler.py:68 #: audits/signals_handler.py:68
#: authentication/templates/authentication/login.html:210 #: authentication/templates/authentication/login.html:210
#: notifications/backends/__init__.py:11 #: notifications/backends/__init__.py:11 users/models/user.py:659
msgid "WeCom" msgid "WeCom"
msgstr "企业微信" msgstr "企业微信"
#: audits/signals_handler.py:69 #: audits/signals_handler.py:69
#: authentication/templates/authentication/login.html:215 #: authentication/templates/authentication/login.html:215
#: notifications/backends/__init__.py:12 #: notifications/backends/__init__.py:12 users/models/user.py:660
msgid "DingTalk" msgid "DingTalk"
msgstr "钉钉" msgstr "钉钉"
@ -1788,7 +1788,7 @@ msgid "CAS"
msgstr "CAS" msgstr "CAS"
#: authentication/templates/authentication/login.html:220 #: authentication/templates/authentication/login.html:220
#: notifications/backends/__init__.py:14 #: notifications/backends/__init__.py:14 users/models/user.py:661
msgid "FeiShu" msgid "FeiShu"
msgstr "飞书" msgstr "飞书"
@ -2487,7 +2487,7 @@ msgstr "来自工单"
#: perms/serializers/application/permission.py:18 #: perms/serializers/application/permission.py:18
#: perms/serializers/application/permission.py:38 #: perms/serializers/application/permission.py:38
#: perms/serializers/asset/permission.py:42 #: perms/serializers/asset/permission.py:42
#: perms/serializers/asset/permission.py:68 users/serializers/user.py:76 #: perms/serializers/asset/permission.py:68 users/serializers/user.py:77
msgid "Is valid" msgid "Is valid"
msgstr "账户是否有效" msgstr "账户是否有效"
@ -2495,7 +2495,7 @@ msgstr "账户是否有效"
#: perms/serializers/application/permission.py:37 #: perms/serializers/application/permission.py:37
#: perms/serializers/asset/permission.py:43 #: perms/serializers/asset/permission.py:43
#: perms/serializers/asset/permission.py:67 users/serializers/user.py:28 #: perms/serializers/asset/permission.py:67 users/serializers/user.py:28
#: users/serializers/user.py:77 #: users/serializers/user.py:78
msgid "Is expired" msgid "Is expired"
msgstr "是否过期" msgstr "是否过期"
@ -5255,7 +5255,7 @@ msgstr ""
msgid "The old password is incorrect" msgid "The old password is incorrect"
msgstr "旧密码错误" msgstr "旧密码错误"
#: users/serializers/profile.py:36 users/serializers/user.py:137 #: users/serializers/profile.py:36 users/serializers/user.py:138
msgid "Password does not match security rules" msgid "Password does not match security rules"
msgstr "密码不满足安全规则" msgstr "密码不满足安全规则"
@ -5267,7 +5267,7 @@ msgstr "新密码不能是最近 {} 次的密码"
msgid "The newly set password is inconsistent" msgid "The newly set password is inconsistent"
msgstr "两次密码不一致" msgstr "两次密码不一致"
#: users/serializers/profile.py:121 users/serializers/user.py:75 #: users/serializers/profile.py:121 users/serializers/user.py:76
msgid "Is first login" msgid "Is first login"
msgstr "首次登录" msgstr "首次登录"
@ -5305,47 +5305,47 @@ msgstr "是否可删除"
msgid "Can public key authentication" msgid "Can public key authentication"
msgstr "能否公钥认证" msgstr "能否公钥认证"
#: users/serializers/user.py:33 users/serializers/user.py:82 #: users/serializers/user.py:33 users/serializers/user.py:83
msgid "Organization role name" msgid "Organization role name"
msgstr "组织角色名称" msgstr "组织角色名称"
#: users/serializers/user.py:78 #: users/serializers/user.py:79
msgid "Avatar url" msgid "Avatar url"
msgstr "头像路径" msgstr "头像路径"
#: users/serializers/user.py:80 #: users/serializers/user.py:81
msgid "Groups name" msgid "Groups name"
msgstr "用户组名" msgstr "用户组名"
#: users/serializers/user.py:81 #: users/serializers/user.py:82
msgid "Source name" msgid "Source name"
msgstr "用户来源名" msgstr "用户来源名"
#: users/serializers/user.py:83 #: users/serializers/user.py:84
msgid "Super role name" msgid "Super role name"
msgstr "超级角色名称" msgstr "超级角色名称"
#: users/serializers/user.py:84 #: users/serializers/user.py:85
msgid "Total role name" msgid "Total role name"
msgstr "汇总角色名称" msgstr "汇总角色名称"
#: users/serializers/user.py:86 #: users/serializers/user.py:87
msgid "Is wecom bound" msgid "Is wecom bound"
msgstr "是否绑定了企业微信" msgstr "是否绑定了企业微信"
#: users/serializers/user.py:87 #: users/serializers/user.py:88
msgid "Is dingtalk bound" msgid "Is dingtalk bound"
msgstr "是否绑定了钉钉" msgstr "是否绑定了钉钉"
#: users/serializers/user.py:88 #: users/serializers/user.py:89
msgid "Is feishu bound" msgid "Is feishu bound"
msgstr "是否绑定了飞书" msgstr "是否绑定了飞书"
#: users/serializers/user.py:111 #: users/serializers/user.py:112
msgid "Role limit to {}" msgid "Role limit to {}"
msgstr "角色只能为 {}" msgstr "角色只能为 {}"
#: users/serializers/user.py:231 #: users/serializers/user.py:232
msgid "name not unique" msgid "name not unique"
msgstr "名称重复" msgstr "名称重复"

View File

@ -13,11 +13,11 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='user', model_name='user',
name='dingtalk_id', name='dingtalk_id',
field=models.CharField(default=None, max_length=128, null=True, unique=True), field=models.CharField(default=None, max_length=128, null=True, unique=True, verbose_name='DingTalk'),
), ),
migrations.AddField( migrations.AddField(
model_name='user', model_name='user',
name='wecom_id', name='wecom_id',
field=models.CharField(default=None, max_length=128, null=True, unique=True), field=models.CharField(default=None, max_length=128, null=True, unique=True, verbose_name='WeCom'),
), ),
] ]

View File

@ -13,6 +13,6 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='user', model_name='user',
name='feishu_id', name='feishu_id',
field=models.CharField(default=None, max_length=128, null=True, unique=True), field=models.CharField(default=None, max_length=128, null=True, unique=True, verbose_name='FeiShu'),
), ),
] ]

View File

@ -656,9 +656,9 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
need_update_password = models.BooleanField( need_update_password = models.BooleanField(
default=False, verbose_name=_('Need update password') default=False, verbose_name=_('Need update password')
) )
wecom_id = models.CharField(null=True, default=None, unique=True, max_length=128) wecom_id = models.CharField(null=True, default=None, unique=True, max_length=128, verbose_name=_('WeCom'))
dingtalk_id = models.CharField(null=True, default=None, unique=True, max_length=128) dingtalk_id = models.CharField(null=True, default=None, unique=True, max_length=128, verbose_name=_('DingTalk'))
feishu_id = models.CharField(null=True, default=None, unique=True, max_length=128) feishu_id = models.CharField(null=True, default=None, unique=True, max_length=128, verbose_name=_('FeiShu'))
def __str__(self): def __str__(self):
return '{0.name}({0.username})'.format(self) return '{0.name}({0.username})'.format(self)

View File

@ -51,6 +51,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
'date_expired', 'date_joined', 'last_login', # 日期字段 'date_expired', 'date_joined', 'last_login', # 日期字段
'created_by', 'comment', # 通用字段 'created_by', 'comment', # 通用字段
'is_wecom_bound', 'is_dingtalk_bound', 'is_feishu_bound', 'is_wecom_bound', 'is_dingtalk_bound', 'is_feishu_bound',
'wecom_id', 'dingtalk_id', 'feishu_id'
] ]
# 包含不太常用的字段,可以没有 # 包含不太常用的字段,可以没有
fields_verbose = fields_small + [ fields_verbose = fields_small + [