Skip to content

Commit 9f1d7c6

Browse files
authored
fix: can not edit password for root user (#771)
Signed-off-by: shanghaikid <jiangruiyi@gmail.com>
1 parent 2bdee89 commit 9f1d7c6

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

client/src/i18n/cn/user.ts

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const userTrans = {
1414
deleteTip: '请至少选择一个要删除的用户,不能删除root用户。',
1515
deleteRoleTip: '请至少选择一个要删除的角色,不能删除admin/public 角色。',
1616
editPassword: '修改密码',
17+
editPassDisabledTip: '请选择一个用户进行编辑。',
1718

1819
// role
1920
deleteEditRoleTip: '请选择一个角色,并且root角色不可编辑。',

client/src/i18n/en/user.ts

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const userTrans = {
1717
deleteRoleTip:
1818
'Please select at least one item to drop and the admin/public role can not be dropped.',
1919
editPassword: 'Edit Password',
20+
editPassDisabledTip: 'Please select one user to edit.',
2021

2122
// role
2223
deleteEditRoleTip: 'Please select one user to edit, root is not editable.',

client/src/pages/user/User.tsx

+2-5
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,8 @@ const Users = () => {
157157
});
158158
},
159159
icon: 'edit',
160-
disabled: () =>
161-
selectedUser.length === 0 ||
162-
selectedUser.length > 1 ||
163-
selectedUser.findIndex(v => v.username === 'root') > -1,
164-
disabledTooltip: userTrans('deleteEditRoleTip'),
160+
disabled: () => selectedUser.length === 0 || selectedUser.length > 1,
161+
disabledTooltip: userTrans('editPassDisabledTip'),
165162
},
166163

167164
{

0 commit comments

Comments
 (0)