Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: deprecation warning in create_account_controller.js. Need to move createAccount into actions.

This commit is contained in:
Neil Lalonde 2013-12-17 12:37:49 -05:00
parent 7fa07f3401
commit 24d81e2364
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/assets/javascripts/discourse/controllers/create_account_controller.js
View File

@ -295,33 +295,34 @@ Discourse.CreateAccountController = Discourse.Controller.extend(Discourse.ModalF
}); });
}, },
createAccount: function() { actions: {
var createAccountController = this; createAccount: function() {
this.set('formSubmitted', true); var createAccountController = this;
var name = this.get('accountName'); this.set('formSubmitted', true);
var email = this.get('accountEmail'); var name = this.get('accountName');
var password = this.get('accountPassword'); var email = this.get('accountEmail');
var username = this.get('accountUsername'); var password = this.get('accountPassword');
var passwordConfirm = this.get('accountPasswordConfirm'); var username = this.get('accountUsername');
var challenge = this.get('accountChallenge'); var passwordConfirm = this.get('accountPasswordConfirm');
return Discourse.User.createAccount(name, email, password, username, passwordConfirm, challenge).then(function(result) { var challenge = this.get('accountChallenge');
if (result.success) { return Discourse.User.createAccount(name, email, password, username, passwordConfirm, challenge).then(function(result) {
createAccountController.flash(result.message); if (result.success) {
createAccountController.set('complete', true); createAccountController.flash(result.message);
} else { createAccountController.set('complete', true);
createAccountController.flash(result.message || I18n.t('create_account.failed'), 'error'); } else {
if (result.errors && result.errors.email && result.values) { createAccountController.flash(result.message || I18n.t('create_account.failed'), 'error');
createAccountController.get('rejectedEmails').pushObject(result.values.email); if (result.errors && result.errors.email && result.values) {
createAccountController.get('rejectedEmails').pushObject(result.values.email);
}
createAccountController.set('formSubmitted', false);
} }
if (result.active) {
return window.location.reload();
}
}, function() {
createAccountController.set('formSubmitted', false); createAccountController.set('formSubmitted', false);
} return createAccountController.flash(I18n.t('create_account.failed'), 'error');
if (result.active) { });
return window.location.reload(); }
}
}, function() {
createAccountController.set('formSubmitted', false);
return createAccountController.flash(I18n.t('create_account.failed'), 'error');
});
} }
}); });