Browse Source

fix: can not edit password for root user (#771)

Signed-off-by: shanghaikid <jiangruiyi@gmail.com>
ryjiang 4 months ago
parent
commit
9f1d7c6283
3 changed files with 4 additions and 5 deletions
  1. 1 0
      client/src/i18n/cn/user.ts
  2. 1 0
      client/src/i18n/en/user.ts
  3. 2 5
      client/src/pages/user/User.tsx

+ 1 - 0
client/src/i18n/cn/user.ts

@@ -14,6 +14,7 @@ const userTrans = {
   deleteTip: '请至少选择一个要删除的用户,不能删除root用户。',
   deleteRoleTip: '请至少选择一个要删除的角色,不能删除admin/public 角色。',
   editPassword: '修改密码',
+  editPassDisabledTip: '请选择一个用户进行编辑。',
 
   // role
   deleteEditRoleTip: '请选择一个角色,并且root角色不可编辑。',

+ 1 - 0
client/src/i18n/en/user.ts

@@ -17,6 +17,7 @@ const userTrans = {
   deleteRoleTip:
     'Please select at least one item to drop and the admin/public role can not be dropped.',
   editPassword: 'Edit Password',
+  editPassDisabledTip: 'Please select one user to edit.',
 
   // role
   deleteEditRoleTip: 'Please select one user to edit, root is not editable.',

+ 2 - 5
client/src/pages/user/User.tsx

@@ -157,11 +157,8 @@ const Users = () => {
         });
       },
       icon: 'edit',
-      disabled: () =>
-        selectedUser.length === 0 ||
-        selectedUser.length > 1 ||
-        selectedUser.findIndex(v => v.username === 'root') > -1,
-      disabledTooltip: userTrans('deleteEditRoleTip'),
+      disabled: () => selectedUser.length === 0 || selectedUser.length > 1,
+      disabledTooltip: userTrans('editPassDisabledTip'),
     },
 
     {