github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 08:56:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: carry username or email from login form to the forgot password and signup forms

Browse Source
This commit is contained in:
Neil Lalonde 2015-02-18 15:01:05 -05:00
parent 7209f67898
commit def034cd08
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/controllers/login.js.es6
View File

@ -2,7 +2,7 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
import DiscourseController from 'discourse/controllers/controller';
export default DiscourseController.extend(ModalFunctionality, {
needs: ['modal', 'createAccount', 'application'],
needs: ['modal', 'createAccount', 'forgotPassword', 'application'],
authenticate: null,
loggingIn: false,
loggedIn: false,
@ -122,8 +122,22 @@ export default DiscourseController.extend(ModalFunctionality, {
createAccount: function() {
var createAccountController = this.get('controllers.createAccount');
createAccountController.resetForm();
if (createAccountController) {
createAccountController.resetForm();
var loginName = this.get('loginName');
if (loginName && loginName.indexOf('@') > 0) {
createAccountController.set("accountEmail", loginName);
} else {
createAccountController.set("accountUsername", loginName);
}
}
this.send('showCreateAccount');
},
forgotPassword: function() {
var forgotPasswordController = this.get('controllers.forgotPassword');
if (forgotPasswordController) { forgotPasswordController.set("accountEmailOrUsername", this.get("loginName")); }
this.send("showForgotPassword");
}
},

2
app/assets/javascripts/discourse/templates/modal/login.hbs
View File

@ -21,7 +21,7 @@
{{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}}  
</td>
<td>
<a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
<a id="forgot-password-link" {{action "forgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
</td>
</tr>
<tr>