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

Clean up after cancelling new model creation

Browse source 
Fixes #27
This commit is contained in:
Matthew Dillon 2015-10-29 16:41:50 -07:00
parent 6ab7e66d03
commit 6dbdd70d31
8 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ export default Ember.Controller.extend({
ajaxError(characteristic.get('errors'), this.get('flashMessages')); ajaxError(characteristic.get('errors'), this.get('flashMessages'));
}); });
} else { } else {
characteristic.deleteRecord().then(() => { characteristic.destroyRecord().then(() => {
this.transitionToRoute('protected.characteristics.show', characteristic); this.transitionToRoute('protected.characteristics.show', characteristic);
}); });
} }

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

@ -13,12 +13,16 @@ export default Ember.Controller.extend({
ajaxError(characteristic.get('errors'), this.get('flashMessages')); ajaxError(characteristic.get('errors'), this.get('flashMessages'));
}); });
} else { } else {
this.transitionToRoute('protected.characteristics.index'); characteristic.destroyRecord().then(() => {
this.transitionToRoute('protected.characteristics.index');
});
} }
}, },
cancel: function() { cancel: function() {
this.transitionToRoute('protected.characteristics.index'); this.get('model').destroyRecord().then(() => {
this.transitionToRoute('protected.characteristics.index');
});
}, },
}, },

6
app/pods/protected/characteristics/new/route.js
View file

@ -18,11 +18,11 @@ export default Ember.Route.extend({
actions: { actions: {
willTransition: function(/*transition*/) { willTransition: function(/*transition*/) {
let controller = this.get('controller'); const controller = this.get('controller');
let characteristic = controller.get('model'); const characteristic = controller.get('model');
if (characteristic.get('isNew')) { if (characteristic.get('isNew')) {
characteristic.deleteRecord(); characteristic.destroyRecord();
} }
}, },
}, },

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

@ -13,14 +13,16 @@ export default Ember.Controller.extend({
ajaxError(species.get('errors'), this.get('flashMessages')); ajaxError(species.get('errors'), this.get('flashMessages'));
}); });
} else { } else {
species.deleteRecord().then(() => { species.destroyRecord().then(() => {
this.transitionToRoute('protected.species.index'); this.transitionToRoute('protected.species.index');
}); });
} }
}, },
cancel: function() { cancel: function() {
this.transitionToRoute('protected.species.index'); this.get('model').destroyRecord().then(() => {
this.transitionToRoute('protected.species.index');
});
}, },
}, },

6
app/pods/protected/species/new/route.js
View file

@ -18,11 +18,11 @@ export default Ember.Route.extend({
actions: { actions: {
willTransition: function(/*transition*/) { willTransition: function(/*transition*/) {
let controller = this.get('controller'); const controller = this.get('controller');
let species = controller.get('model'); const species = controller.get('model');
if (species.get('isNew')) { if (species.get('isNew')) {
species.deleteRecord(); species.destroyRecord();
} }
}, },
}, },

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

@ -13,7 +13,7 @@ export default Ember.Controller.extend({
ajaxError(strain.get('errors'), this.get('flashMessages')); ajaxError(strain.get('errors'), this.get('flashMessages'));
}); });
} else { } else {
strain.deleteRecord().then(() => { strain.destroyRecord().then(() => {
this.transitionToRoute('protected.strains.show', strain); this.transitionToRoute('protected.strains.show', strain);
}); });
} }

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

@ -13,12 +13,16 @@ export default Ember.Controller.extend({
ajaxError(strain.get('errors'), this.get('flashMessages')); ajaxError(strain.get('errors'), this.get('flashMessages'));
}); });
} else { } else {
this.transitionToRoute('protected.strains.index'); strain.destroyRecord().then(() => {
this.transitionToRoute('protected.strains.index');
});
} }
}, },
cancel: function() { cancel: function() {
this.transitionToRoute('protected.strains.index'); this.get('strain').destroyRecord().then(() => {
this.transitionToRoute('protected.strains.index');
});
}, },
}, },

6
app/pods/protected/strains/new/route.js
View file

@ -25,11 +25,11 @@ export default Ember.Route.extend({
actions: { actions: {
willTransition: function(/*transition*/) { willTransition: function(/*transition*/) {
let controller = this.get('controller'); const controller = this.get('controller');
let strain = controller.get('strain'); const strain = controller.get('strain');
if (strain.get('isNew')) { if (strain.get('isNew')) {
strain.deleteRecord(); strain.destroyRecord();
} }
}, },
}, },