Merge branch 'master' into clostridium

* master:
  DS deprecation (rollback)
  Fix up moment js
  Drop brocfile
  ember-cli 1.13.8
  Fix transition deprecation
  Upgrade ember-cli-flash
This commit is contained in:
Matthew Dillon 2015-08-24 19:29:10 -07:00
commit 9696313568
7 changed files with 26 additions and 44 deletions

View file

@ -9,7 +9,7 @@ export default Ember.Controller.extend({
// Manually clean up because there might not be a transition
this.get('flashMessages').clearMessages();
this.transitionTo('loading').then(() => {
this.transitionToRoute('loading').then(() => {
session.authenticate(authenticator, credentials).then(null, (error)=> {
this.get('flashMessages').error(error.error);
});

View file

@ -20,7 +20,7 @@ export default Ember.Controller.extend({
let species = this.get('model');
species.get('errors').clear();
species.rollback();
species.rollbackAttributes();
this.transitionToRoute('protected.species.show', species);
},

View file

@ -21,7 +21,7 @@ export default Ember.Controller.extend({
let strain = this.get('strain');
strain.get('errors').clear();
strain.rollback();
strain.rollbackAttributes();
this.transitionToRoute('protected.strains.show', strain);
},