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

Merge branch 'master' into clostridium

Browse source 
* master:
  Revert #22
This commit is contained in:
Matthew Dillon 2015-10-21 07:28:59 -07:00
commit 80bd608045
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,20 +3,19 @@ import Ember from 'ember';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
session: Ember.inject.service('session'), session: Ember.inject.service('session'),
loading: false,
actions: { actions: {
authenticate: function() { authenticate: function() {
// 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();
let { identification, password } = this.getProperties('identification', 'password'); let { identification, password } = this.getProperties('identification', 'password');
this.set('loading', true); this.transitionToRoute('loading').then(() => {
this.get('session').authenticate('authenticator:oauth2', identification, password).catch((error) => { this.get('session').authenticate('authenticator:oauth2', identification, password).catch((error) => {
this.transitionToRoute('login'); this.transitionToRoute('login').then(() => {
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,16 +1,12 @@
{{#x-application invalidateSession="invalidateSession"}} {{#x-application invalidateSession="invalidateSession"}}
{{#if loading}} <form {{action "authenticate" on="submit"}}>
{{loading-panel}} <h2>Log In</h2>
{{else}} {{input value=identification type="text" placeholder="Email"}}
<form {{action "authenticate" on="submit"}}> {{input value=password type="password" placeholder="Password"}}
<h2>Log In</h2> {{input class="button-gray" type="submit" value="Log In"}}
{{input value=identification type="text" placeholder="Email"}} </form>
{{input value=password type="password" placeholder="Password"}} <br>
{{input class="button-gray" type="submit" value="Log In"}} <div>
</form> Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
<br> </div>
<div>
Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
</div>
{{/if}}
{{/x-application}} {{/x-application}}