thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't transition to loading route during login

Browse source 
Fixes #22.
This commit is contained in:
Matthew Ryan Dillon 2015-10-19 16:26:25 -07:00
parent 002bfa6d81
commit 135d7a2c2c
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/pods/login/controller.js
View file

@ -1,6 +1,8 @@
import Ember from 'ember'; import Ember from 'ember';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
loading: false,
actions: { actions: {
authenticate: function() { authenticate: function() {
let credentials = this.getProperties('identification', 'password'); let credentials = this.getProperties('identification', 'password');
@ -9,12 +11,12 @@ export default Ember.Controller.extend({
// Manually clean up because there might not be a transition // Manually clean up because there might not be a transition
this.get('flashMessages').clearMessages(); this.get('flashMessages').clearMessages();
this.transitionToRoute('loading').then(() => { this.set('loading', true).then(session.authenticate(authenticator, credentials).catch((error) => {
session.authenticate(authenticator, credentials).then(null, (error)=> { this.transitionToRoute('login');
this.transitionToRoute('login'); this.set('loading', false);
this.get('flashMessages').error(error.error); this.get('flashMessages').error(error.error);
}); }));
}); this.set('loading', false);
} }
} }
}); });

24
app/pods/login/template.hbs
View file

@ -1,12 +1,16 @@
{{#x-application invalidateSession="invalidateSession"}} {{#x-application invalidateSession="invalidateSession"}}
<form {{action "authenticate" on="submit"}}> {{#if loading}}
<h2>Log In</h2> {{loading-panel}}
{{input value=identification type="text" placeholder="Email"}} {{else}}
{{input value=password type="password" placeholder="Password"}} <form {{action "authenticate" on="submit"}}>
{{input class="button-gray" type="submit" value="Log In"}} <h2>Log In</h2>
</form> {{input value=identification type="text" placeholder="Email"}}
<br> {{input value=password type="password" placeholder="Password"}}
<div> {{input class="button-gray" type="submit" value="Log In"}}
Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}} </form>
</div> <br>
<div>
Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
</div>
{{/if}}
{{/x-application}} {{/x-application}}