diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index cc196c255..c53fd8024 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -574,7 +574,7 @@ "JobManagement": "Jobs", "JobUpdate": "Update the Job", "KingSoftCloud": "KingSoft Cloud", - "KokoSettingUpdate": "Koko Configuration Settings", + "KokoSettingUpdate": "Koko", "LAN": "Bulk Account Add Results", "LDAPUser": "LDAP Users", "Label": "Label", @@ -617,7 +617,7 @@ "LoginImageTip": "Note: It will appear on the enterprise user login page (recommended image size: 492*472px)", "LoginLog": "Login Log", "LoginNum": "Login Count", - "LoginPasswordSetting": "Login Password Settings", + "LoginPasswordSetting": "Login Password", "LoginRequiredMsg": "The account has logged out, please log in again.", "LoginSucceeded": "Login Successful", "LoginTitleTip": "Note: It will be displayed on the enterprise edition user SSH login KoKo login page (e.g.: Welcome to use JumpServer Open Source Bastion)", @@ -629,7 +629,7 @@ "Logout": "Logout", "LogsAudit": "Log auditing", "Lowercase": "Lowercase", - "LunaSettingUpdate": "Luna Configuration Settings", + "LunaSettingUpdate": "Luna", "MFAErrorMsg": "MFA errors, please check", "MFAOfUserFirstLoginPersonalInformationImprovementPage": "Enable multi-factor authentication to make your account more secure.
After enabling, you will enter the multi-factor authentication binding process the next time you log in; you can also directly bind in (Personal Information->Quick Modification->Change Multi-factor Settings)!", "MFAOfUserFirstLoginUserGuidePage": "In order to protect your and the company's security, please carefully safeguard important sensitive information such as your account, password, and key (for example, set a complex password, and enable multi-factor authentication)
Personal information such as email, mobile number, and WeChat are only used for user authentication and platform internal message notifications.", @@ -707,8 +707,8 @@ "Offline": "Offline", "OfflineSuccessMsg": "Offline Successfully", "OfflineUpload": "Offline Upload", - "OldPassword": "Original Password", - "OldSSHKey": "Original SSH Public Key", + "OldPassword": "Old Password", + "OldSSHKey": "Old SSH Public Key", "OneAssignee": "First-Level Approver", "OneAssigneeType": "First-Level Handler Type", "OneClickReadMsg": "Are you sure you want to mark the current information as read?", @@ -924,7 +924,7 @@ "SMTP": "Email Server", "SSHKey": "SSH Key", "SSHKeyOfProfileSSHUpdatePage": "Copy Your Public Key Here", - "SSHKeySetting": "SSH Key Settings", + "SSHKeySetting": "SSH Key", "SSHPort": "SSH Port", "SSHSecretKey": "SSH Key", "SafeCommand": "Secure Command", @@ -1181,7 +1181,7 @@ "UserGroupList": "Groups", "UserGroupUpdate": "Update the User Group", "UserGroups": "User Groups", - "UserInformation": "User Information", + "UserInformation": "User Info", "UserList": "Users", "UserLoginACLHelpMsg": "When logging into the system, the user's login IP and time range can be audited to determine whether they are allowed to log into the system (effective globally)", "UserLoginAclCreate": "Create a User Login Control", diff --git a/apps/users/serializers/profile.py b/apps/users/serializers/profile.py index eacc0bff3..6b04671f8 100644 --- a/apps/users/serializers/profile.py +++ b/apps/users/serializers/profile.py @@ -118,6 +118,7 @@ class UserProfileSerializer(UserSerializer): ] fields = UserSerializer.Meta.fields + [ 'public_key_comment', 'public_key_hash_md5', 'guide_url', + "wecom_id", "dingtalk_id", "feishu_id", "slack_id", ] + read_only_fields extra_kwargs = dict(UserSerializer.Meta.extra_kwargs) diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py index 1467b4c2b..b5b42a5e5 100644 --- a/apps/users/serializers/user.py +++ b/apps/users/serializers/user.py @@ -120,8 +120,7 @@ class UserSerializer(RolesSerializerMixin, ResourceLabelsMixin, CommonBulkModelS ] # small 指的是 不需要计算的直接能从一张表中获取到的数据 fields_small = fields_mini + fields_write_only + [ - "email", "wechat", "phone", "mfa_level", "source", - "wecom_id", "dingtalk_id", "feishu_id", "slack_id", + "email", "phone", "mfa_level", "source", "created_by", "updated_by", "comment", # 通用字段 ] fields_date = [