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

Show validation errors on save

Browse source 
Fixes #17.
This commit is contained in:
Matthew Dillon 2015-10-14 10:27:18 -07:00
parent 007de178d8
commit 8577c38a9f
11 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/pods/protected/characteristics/edit/controller.js
View file

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

5
app/pods/protected/characteristics/new/controller.js
View file

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

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

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

5
app/pods/protected/species/new/controller.js
View file

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

5
app/pods/protected/strains/edit/controller.js
View file

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

5
app/pods/protected/strains/new/controller.js
View file

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

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

@ -1,4 +1,5 @@
import Ember from 'ember'; import Ember from 'ember';
import ajaxError from '../../../../../utils/ajax-error';
export default Ember.Component.extend({ export default Ember.Component.extend({
tagName: 'tr', tagName: 'tr',
@ -22,9 +23,15 @@ export default Ember.Component.extend({
}, },
save: function() { save: function() {
this.toggleProperty('isEditing');
if (this.get('rowChanged')) { 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');
} }
}, },

5
app/pods/protected/strains/strain-form/component.js
View file

@ -3,11 +3,6 @@ import Ember from 'ember';
export default Ember.Component.extend({ export default Ember.Component.extend({
actions: { actions: {
save: function() { 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'); this.sendAction('save');
}, },

7
app/pods/protected/users/edit/controller.js
View file

@ -1,4 +1,5 @@
import Ember from 'ember'; import Ember from 'ember';
import ajaxError from '../../../../utils/ajax-error';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
actions: { actions: {
@ -18,10 +19,8 @@ export default Ember.Controller.extend({
this.get('store').unloadAll(); this.get('store').unloadAll();
} }
this.transitionToRoute('protected.users.show', user); 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 { } else {
this.transitionToRoute('protected.users.show', user); this.transitionToRoute('protected.users.show', user);

9
app/pods/users/new/controller.js
View file

@ -1,4 +1,5 @@
import Ember from 'ember'; import Ember from 'ember';
import ajaxError from '../../../utils/ajax-error';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
passwordConfirm: null, passwordConfirm: null,
@ -20,12 +21,8 @@ export default Ember.Controller.extend({
this.get('flashMessages').information(`You have successfully signed up. this.get('flashMessages').information(`You have successfully signed up.
Please check your email for further instructions.`); 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}`);
});
}); });
} }
}, },

7
app/utils/ajax-error.js Normal file
View file

@ -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}`);
});
}