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

FIX: Forgot Password route was broken

This commit is contained in:
Robin Ward 2016-12-30 12:47:04 -05:00
parent da76dd3d6b
commit 32301f4620
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/routes/forgot-password.js.es6
View File

@ -1,10 +1,12 @@
import { defaultHomepage } from 'discourse/lib/utilities';
import buildStaticRoute from 'discourse/routes/build-static-route'; import buildStaticRoute from 'discourse/routes/build-static-route';
const ForgotPasswordRoute = buildStaticRoute('password-reset'); const ForgotPasswordRoute = buildStaticRoute('password-reset');
ForgotPasswordRoute.reopen({ ForgotPasswordRoute.reopen({
beforeModel() { beforeModel() {
this.replaceWith(this.controllerFor('application').get('loginRequired') ? 'login' : 'discovery').then(e => { const loginRequired = this.controllerFor('application').get('loginRequired');
this.replaceWith(loginRequired ? 'login' : `discovery.${defaultHomepage()}`).then(e => {
Ember.run.next(() => e.send('showForgotPassword')); Ember.run.next(() => e.send('showForgotPassword'));
}); });
}, },

14
app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
View File

@ -1,9 +1,9 @@
<form> <form>
<div class="modal-body"> {{#d-modal-body}}
<label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label> <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
{{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}} {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
</div> {{/d-modal-body}}
<div class="modal-footer"> <div class="modal-footer">
<button class='btn btn-large btn-primary' disabled={{submitDisabled}} {{action "submit"}}>{{i18n 'forgot_password.reset'}}</button> <button class='btn btn-large btn-primary' disabled={{submitDisabled}} {{action "submit"}}>{{i18n 'forgot_password.reset'}}</button>
</div> </div>
</form> </form>