Merge branch 'master' into clostridium

* master:
  Show validation errors on save

app/pods/protected/characteristics/edit/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../../utils/ajax-error';
 
 export default Ember.Controller.extend({
   actions: {
@@ -8,8 +9,8 @@ export default Ember.Controller.extend({
       if (characteristic.get('hasDirtyAttributes')) {
         characteristic.save().then((characteristic) => {
           this.transitionToRoute('protected.characteristics.show', characteristic);
-        }, (err) => {
+        }, () => {
-          this.get('flashMessages').error(err.responseJSON.error);
+          ajaxError(characteristic.get('errors'), this.get('flashMessages'));
         });
       } else {
         characteristic.deleteRecord();

app/pods/protected/characteristics/new/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../../utils/ajax-error';
 
 export default Ember.Controller.extend({
   actions: {
@@ -8,8 +9,8 @@ export default Ember.Controller.extend({
       if (characteristic.get('hasDirtyAttributes')) {
         characteristic.save().then((characteristic) => {
           this.transitionToRoute('protected.characteristics.show', characteristic);
-        }, (err) => {
+        }, () => {
-          this.get('flashMessages').error(err.responseJSON.error);
+          ajaxError(characteristic.get('errors'), this.get('flashMessages'));
         });
       } else {
         this.transitionToRoute('protected.characteristics.index');

app/pods/protected/species/edit/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../../utils/ajax-error';
 
 export default Ember.Controller.extend({
   actions: {
@@ -8,8 +9,8 @@ export default Ember.Controller.extend({
       if (species.get('hasDirtyAttributes')) {
         species.save().then((species) => {
           this.transitionToRoute('protected.species.show', species);
-        }, (err) => {
+        }, () => {
-          this.get('flashMessages').error(err.responseJSON.error);
+          ajaxError(species.get('errors'), this.get('flashMessages'));
         });
       } else {
         this.transitionToRoute('protected.species.show', species);

app/pods/protected/species/new/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../../utils/ajax-error';
 
 export default Ember.Controller.extend({
   actions: {
@@ -8,8 +9,8 @@ export default Ember.Controller.extend({
       if (species.get('hasDirtyAttributes')) {
         species.save().then((species) => {
           this.transitionToRoute('protected.species.show', species.get('id'));
-        }, (err) => {
+        }, () => {
-          this.get('flashMessages').error(err.responseJSON.error);
+          ajaxError(species.get('errors'), this.get('flashMessages'));
         });
       } else {
         species.deleteRecord();

app/pods/protected/strains/edit/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../../utils/ajax-error';
 
 export default Ember.Controller.extend({
   actions: {
@@ -8,8 +9,8 @@ export default Ember.Controller.extend({
       if (strain.get('hasDirtyAttributes')) {
         strain.save().then((strain) => {
           this.transitionToRoute('protected.strains.show', strain);
-        }, (err) => {
+        }, () => {
-          this.get('flashMessages').error(err.responseJSON.error);
+          ajaxError(strain.get('errors'), this.get('flashMessages'));
         });
       } else {
         strain.deleteRecord();

app/pods/protected/strains/new/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../../utils/ajax-error';
 
 export default Ember.Controller.extend({
   actions: {
@@ -8,8 +9,8 @@ export default Ember.Controller.extend({
       if (strain.get('hasDirtyAttributes')) {
         strain.save().then((strain) => {
           this.transitionToRoute('protected.strains.show', strain);
-        }, (err) => {
+        }, () => {
-          this.get('flashMessages').error(err.responseJSON.error);
+          ajaxError(strain.get('errors'), this.get('flashMessages'));
         });
       } else {
         this.transitionToRoute('protected.strains.index');

app/pods/protected/strains/show/measurements-table-row/component.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../../../utils/ajax-error';
 
 export default Ember.Component.extend({
   tagName: 'tr',
@@ -22,9 +23,15 @@ export default Ember.Component.extend({
     },
 
     save: function() {
-      this.toggleProperty('isEditing');
       if (this.get('rowChanged')) {
-        this.get('row').save();
+        this.get('row').save().then(() => {
+          this.get('flashMessages').clearMessage();
+          this.toggleProperty('isEditing');
+        }, () => {
+          ajaxError(this.get('row.errors'), this.get('flashMessages'));
+        });
+      } else {
+        this.toggleProperty('isEditing');
       }
     },
 

app/pods/protected/strains/strain-form/component.js

@@ -3,11 +3,6 @@ import Ember from 'ember';
 export default Ember.Component.extend({
   actions: {
     save: function() {
-      // Need to override the string id for some reason
-      // TODO: check this
-      let strain = this.get('strain');
-      let id = strain.get('species.id');
-      strain.set('species.id', +id);
       this.sendAction('save');
     },
 

app/pods/protected/users/edit/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../../utils/ajax-error';
 
 export default Ember.Controller.extend({
   actions: {
@@ -18,10 +19,8 @@ export default Ember.Controller.extend({
             this.get('store').unloadAll();
           }
           this.transitionToRoute('protected.users.show', user);
-        }, (err) => {
+        }, () => {
-          err.errors.forEach((error) => {
+          ajaxError(user.get('errors'), this.get('flashMessages'));
-            this.get('flashMessages').error(error.detail);
-          });
         });
       } else {
         this.transitionToRoute('protected.users.show', user);

app/pods/users/new/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import ajaxError from '../../../utils/ajax-error';
 
 export default Ember.Controller.extend({
   passwordConfirm: null,
@@ -20,12 +21,8 @@ export default Ember.Controller.extend({
             this.get('flashMessages').information(`You have successfully signed up.
               Please check your email for further instructions.`);
           });
-        }).catch(() => {
+        }, () => {
-          // Manually clean up messages because there is no transition
+          ajaxError(user.get('errors'), this.get('flashMessages'));
-          this.get('flashMessages').clearMessages();
-          user.get('errors').forEach((error) => {
-            this.get('flashMessages').error(`${error.attribute.capitalize()} - ${error.message}`);
-          });
         });
       }
     },

app/utils/ajax-error.js

@@ -0,0 +1,7 @@
+export default function ajaxError(errors, flash) {
+  flash.clearMessages();
+  errors.forEach((error) => {
+    console.log(error);
+    flash.error(`${error.attribute.replace(/([A-Z])/g, ' $1').capitalize()} - ${error.message}`);
+  });
+}