diff options
Diffstat (limited to 'webapp/components/user_settings')
4 files changed, 29 insertions, 10 deletions
diff --git a/webapp/components/user_settings/manage_languages.jsx b/webapp/components/user_settings/manage_languages.jsx index f4ae79088..4f5eb223d 100644 --- a/webapp/components/user_settings/manage_languages.jsx +++ b/webapp/components/user_settings/manage_languages.jsx @@ -3,13 +3,12 @@ import SettingItemMax from '../setting_item_max.jsx'; -import Client from 'client/web_client.jsx'; import * as I18n from 'i18n/i18n.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import Constants from 'utils/constants.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; - +import {updateUser} from 'actions/user_actions.jsx'; import React from 'react'; export default class ManageLanguage extends React.Component { @@ -42,7 +41,7 @@ export default class ManageLanguage extends React.Component { this.submitUser(user); } submitUser(user) { - Client.updateUser(user, Constants.UserUpdateEvents.LANGUAGE, + updateUser(user, Constants.UserUpdateEvents.LANGUAGE, () => { GlobalActions.newLocalizationSelected(user.locale); }, diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index e794c4d4b..805650608 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -15,6 +15,7 @@ import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; import {intlShape, injectIntl, defineMessages, FormattedMessage, FormattedHTMLMessage, FormattedDate} from 'react-intl'; +import {updateUser} from 'actions/user_actions.jsx'; const holders = defineMessages({ usernameReserved: { @@ -187,7 +188,7 @@ class UserSettingsGeneralTab extends React.Component { } submitUser(user, type, emailUpdated) { - Client.updateUser(user, type, + updateUser(user, type, () => { this.updateSection(''); AsyncClient.getMe(); @@ -461,7 +462,7 @@ class UserSettingsGeneralTab extends React.Component { inputs.push( <div key='oauthEmailInfo' - className='form-group' + className='padding-bottom' > <div className='setting-list__hint'> <FormattedMessage @@ -479,7 +480,7 @@ class UserSettingsGeneralTab extends React.Component { inputs.push( <div key='oauthEmailInfo' - className='form-group' + className='padding-bottom' > <div className='setting-list__hint'> <FormattedMessage diff --git a/webapp/components/user_settings/user_settings_modal.jsx b/webapp/components/user_settings/user_settings_modal.jsx index 9112f8711..c1194ed78 100644 --- a/webapp/components/user_settings/user_settings_modal.jsx +++ b/webapp/components/user_settings/user_settings_modal.jsx @@ -104,7 +104,6 @@ class UserSettingsModal extends React.Component { } this.props.onModalDismissed(); - return; } // called after the dialog is fully hidden and faded out @@ -251,7 +250,6 @@ class UserSettingsModal extends React.Component { setRequireConfirm={ (requireConfirm) => { this.requireConfirm = requireConfirm; - return; } } /> diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 0cee3dfca..5f231e499 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -289,7 +289,7 @@ export default class SecurityTab extends React.Component { <span> <FormattedMessage id='user.settings.mfa.addHelpQr' - defaultMessage='Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app. If you are unable to scan the code, you can maunally enter the secret provided.' + defaultMessage='Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app. If you are unable to scan the code, you can manually enter the secret provided.' /> </span> ); @@ -473,6 +473,20 @@ export default class SecurityTab extends React.Component { </div> </div> ); + } else if (this.props.user.auth_service === Constants.SAML_SERVICE) { + inputs.push( + <div + key='oauthEmailInfo' + className='form-group' + > + <div className='setting-list__hint'> + <FormattedMessage + id='user.settings.security.passwordSamlCantUpdate' + defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so through your login provider.' + /> + </div> + </div> + ); } updateSectionStatus = function resetSection(e) { @@ -533,7 +547,7 @@ export default class SecurityTab extends React.Component { describe = ( <FormattedMessage id='user.settings.security.loginGitlab' - defaultMessage='Login done through Gitlab' + defaultMessage='Login done through GitLab' /> ); } else if (this.props.user.auth_service === Constants.LDAP_SERVICE) { @@ -543,6 +557,13 @@ export default class SecurityTab extends React.Component { defaultMessage='Login done through AD/LDAP' /> ); + } else if (this.props.user.auth_service === Constants.SAML_SERVICE) { + describe = ( + <FormattedMessage + id='user.settings.security.loginSaml' + defaultMessage='Login done through SAML' + /> + ); } updateSectionStatus = function updateSection() { |