IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1040 from mattermost/plt-601

Browse Source 
PLT-601 Fixing user settings modal general tab.
This commit is contained in:
Christopher Speller
2015-10-13 16:30:07 -04:00
parent 2be9d5a183 d0d00d9dbe
commit 2bbe8f48f7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web/react/components/user_settings/user_settings_general.jsx
View File

@@ -59,7 +59,7 @@ export default class UserSettingsGeneralTab extends React.Component {
user.username = username;
this.submitUser(user);
this.submitUser(user, false);
}
submitNickname(e) {
e.preventDefault();
@@ -74,7 +74,7 @@ export default class UserSettingsGeneralTab extends React.Component {
user.nickname = nickname;
this.submitUser(user);
this.submitUser(user, false);
}
submitName(e) {
e.preventDefault();
@@ -91,7 +91,7 @@ export default class UserSettingsGeneralTab extends React.Component {
user.first_name = firstName;
user.last_name = lastName;
this.submitUser(user);
this.submitUser(user, false);
}
submitEmail(e) {
e.preventDefault();
@@ -115,22 +115,22 @@ export default class UserSettingsGeneralTab extends React.Component {
}
user.email = email;
this.submitUser(user);
this.submitUser(user, true);
}
submitUser(user) {
submitUser(user, emailUpdated) {
client.updateUser(user,
function updateSuccess() {
() => {
this.updateSection('');
AsyncClient.getMe();
const verificationEnabled = global.window.config.SendEmailNotifications === 'true' && global.window.config.RequireEmailVerification === 'true';
const verificationEnabled = global.window.config.SendEmailNotifications === 'true' && global.window.config.RequireEmailVerification === 'true' && emailUpdated;
if (verificationEnabled) {
ErrorStore.storeLastError({message: 'Check your email at ' + user.email + ' to verify the address.'});
ErrorStore.emitChange();
this.setState({emailChangeInProgress: true});
}
}.bind(this),
function updateFailure(err) {
},
(err) => {
var state = this.setupInitialState(this.props);
if (err.message) {
state.serverError = err.message;
@@ -138,7 +138,7 @@ export default class UserSettingsGeneralTab extends React.Component {
state.serverError = err;
}
this.setState(state);
}.bind(this)
}
);
}
submitPicture(e) {