From 29807b82e1d66caa1de87e601dfa6f411a58c2df Mon Sep 17 00:00:00 2001 From: Gucheng Wang Date: Sun, 12 Dec 2021 19:15:24 +0800 Subject: [PATCH] Admin can reset password without old password. --- web/src/PasswordModal.js | 3 ++- web/src/UserEditPage.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/src/PasswordModal.js b/web/src/PasswordModal.js index 256a3bd0..cc8baaff 100644 --- a/web/src/PasswordModal.js +++ b/web/src/PasswordModal.js @@ -25,6 +25,7 @@ export const PasswordModal = (props) => { const [newPassword, setNewPassword] = React.useState(""); const [rePassword, setRePassword] = React.useState(""); const {user} = props; + const {account} = props; const showModal = () => { setVisible(true); @@ -73,7 +74,7 @@ export const PasswordModal = (props) => { width={600} > - { hasOldPassword ? ( + { (hasOldPassword && !Setting.isAdminUser(account)) ? ( setOldPassword(e.target.value)}/> diff --git a/web/src/UserEditPage.js b/web/src/UserEditPage.js index 2c76cdc4..885f224c 100644 --- a/web/src/UserEditPage.js +++ b/web/src/UserEditPage.js @@ -202,7 +202,7 @@ class UserEditPage extends React.Component { {Setting.getLabel(i18next.t("general:Password"), i18next.t("general:Password - Tooltip"))} : - +