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:
  Fix "New Strain" button under species edit
  Don't transition to loading route during login
This commit is contained in:
Matthew Ryan Dillon 2015-10-19 16:52:31 -07:00
commit 7665452f72
5 changed files with 36 additions and 21 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}}

5
app/pods/protected/species/edit/route.js
View file

@ -16,4 +16,9 @@ export default Ember.Route.extend({
} }
}, },
setupController: function(controller, model) {
controller.set('model', model);
controller.set('metaData', this.store.metadataFor('species'));
},
}); });

1
app/pods/protected/species/edit/template.hbs
View file

@ -1,6 +1,7 @@
{{ {{
protected/species/species-form protected/species/species-form
species=model species=model
metaData=metaData
save="save" save="save"
cancel="cancel" cancel="cancel"
}} }}

13
app/pods/protected/species/species-form/template.hbs
View file

@ -11,8 +11,9 @@
{{input type="checkbox" checked=species.typeSpecies}} {{if species.typeSpecies 'Yes' 'No'}} {{input type="checkbox" checked=species.typeSpecies}} {{if species.typeSpecies 'Yes' 'No'}}
</div> </div>
</div> </div>
<div data-row-span="2"> {{#unless species.isNew}}
<div data-field-span="2"> <div data-row-span="1">
<div data-field-span="1">
<label>Strains</label> <label>Strains</label>
{{#each species.strains as |strain index|}} {{#each species.strains as |strain index|}}
{{if index ","}} {{if index ","}}
@ -20,11 +21,13 @@
{{{strain.strainNameMU}}} {{{strain.strainNameMU}}}
{{/link-to}} {{/link-to}}
{{/each}} {{/each}}
{{add-button label="Add Strain" link="protected.strains.new"}} {{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}}
</div> </div>
</div> </div>
<div data-row-span="2"> {{/unless}}
<div data-field-span="2">
<div data-row-span="1">
<div data-field-span="1">
<label>Etymology</label> <label>Etymology</label>
{{text-editor value=species.etymology}} {{text-editor value=species.etymology}}
</div> </div>