diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/admin_console/reset_password_modal.jsx | 25 | ||||
-rw-r--r-- | webapp/components/admin_console/user_item.jsx | 48 |
2 files changed, 56 insertions, 17 deletions
diff --git a/webapp/components/admin_console/reset_password_modal.jsx b/webapp/components/admin_console/reset_password_modal.jsx index 5133f3f28..c383a4fb8 100644 --- a/webapp/components/admin_console/reset_password_modal.jsx +++ b/webapp/components/admin_console/reset_password_modal.jsx @@ -58,7 +58,8 @@ class ResetPasswordModal extends React.Component { } render() { - if (this.props.user == null) { + const user = this.props.user; + if (user == null) { return <div/>; } @@ -70,6 +71,23 @@ class ResetPasswordModal extends React.Component { serverError = <div className='form-group has-error'><p className='input__help error'>{this.state.serverError}</p></div>; } + let title; + if (user.auth_service) { + title = ( + <FormattedMessage + id='admin.reset_password.titleSwitch' + defaultMessage='Switch Account to Email/Password' + /> + ); + } else { + title = ( + <FormattedMessage + id='admin.reset_password.titleReset' + defaultMessage='Reset Password' + /> + ); + } + return ( <Modal show={this.props.show} @@ -77,10 +95,7 @@ class ResetPasswordModal extends React.Component { > <Modal.Header closeButton={true}> <Modal.Title> - <FormattedMessage - id='admin.reset_password.title' - defaultMessage='Reset Password' - /> + {title} </Modal.Title> </Modal.Header> <form diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx index b8f21d77e..660f75a41 100644 --- a/webapp/components/admin_console/user_item.jsx +++ b/webapp/components/admin_console/user_item.jsx @@ -366,6 +366,7 @@ export default class UserItem extends React.Component { } let authServiceText; + let passwordReset; if (user.auth_service) { authServiceText = ( <FormattedHTMLMessage @@ -376,6 +377,21 @@ export default class UserItem extends React.Component { }} /> ); + + passwordReset = ( + <li role='presentation'> + <a + role='menuitem' + href='#' + onClick={this.handleResetPassword} + > + <FormattedMessage + id='admin.user_item.switchToEmail' + defaultMessage='Switch to Email/Password' + /> + </a> + </li> + ); } else { authServiceText = ( <FormattedHTMLMessage @@ -383,6 +399,25 @@ export default class UserItem extends React.Component { defaultMessage=', <strong>Sign-in Method:</strong> Email' /> ); + + passwordReset = ( + <li role='presentation'> + <a + role='menuitem' + href='#' + onClick={this.handleResetPassword} + > + <FormattedMessage + id='admin.user_item.resetPwd' + defaultMessage='Reset Password' + /> + </a> + </li> + ); + } + + if (global.window.mm_config.EnableSignInWithEmail !== 'true') { + passwordReset = null; } const me = UserStore.getCurrentUser(); @@ -474,18 +509,7 @@ export default class UserItem extends React.Component { {makeNotActive} {makeSystemAdmin} {mfaReset} - <li role='presentation'> - <a - role='menuitem' - href='#' - onClick={this.handleResetPassword} - > - <FormattedMessage - id='admin.user_item.resetPwd' - defaultMessage='Reset Password' - /> - </a> - </li> + {passwordReset} </ul> </div> </div> |