From 6dbdd70d31b22a96a7c2c970d1c6cfde408cdbd3 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Thu, 29 Oct 2015 16:41:50 -0700
Subject: [PATCH] Clean up after cancelling new model creation

Fixes #27
---
 app/pods/protected/characteristics/edit/controller.js | 2 +-
 app/pods/protected/characteristics/new/controller.js  | 8 ++++++--
 app/pods/protected/characteristics/new/route.js       | 6 +++---
 app/pods/protected/species/new/controller.js          | 6 ++++--
 app/pods/protected/species/new/route.js               | 6 +++---
 app/pods/protected/strains/edit/controller.js         | 2 +-
 app/pods/protected/strains/new/controller.js          | 8 ++++++--
 app/pods/protected/strains/new/route.js               | 6 +++---
 8 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/app/pods/protected/characteristics/edit/controller.js b/app/pods/protected/characteristics/edit/controller.js
index 2acb5dd..3c8ecf2 100644
--- a/app/pods/protected/characteristics/edit/controller.js
+++ b/app/pods/protected/characteristics/edit/controller.js
@@ -13,7 +13,7 @@ export default Ember.Controller.extend({
           ajaxError(characteristic.get('errors'), this.get('flashMessages'));
         });
       } else {
-        characteristic.deleteRecord().then(() => {
+        characteristic.destroyRecord().then(() => {
           this.transitionToRoute('protected.characteristics.show', characteristic);
         });
       }
diff --git a/app/pods/protected/characteristics/new/controller.js b/app/pods/protected/characteristics/new/controller.js
index 2b852e7..1d9eef6 100644
--- a/app/pods/protected/characteristics/new/controller.js
+++ b/app/pods/protected/characteristics/new/controller.js
@@ -13,12 +13,16 @@ export default Ember.Controller.extend({
           ajaxError(characteristic.get('errors'), this.get('flashMessages'));
         });
       } else {
-        this.transitionToRoute('protected.characteristics.index');
+        characteristic.destroyRecord().then(() => {
+          this.transitionToRoute('protected.characteristics.index');
+        });
       }
     },
 
     cancel: function() {
-      this.transitionToRoute('protected.characteristics.index');
+      this.get('model').destroyRecord().then(() => {
+        this.transitionToRoute('protected.characteristics.index');
+      });
     },
 
   },
diff --git a/app/pods/protected/characteristics/new/route.js b/app/pods/protected/characteristics/new/route.js
index 2773092..34165dd 100644
--- a/app/pods/protected/characteristics/new/route.js
+++ b/app/pods/protected/characteristics/new/route.js
@@ -18,11 +18,11 @@ export default Ember.Route.extend({
 
   actions: {
     willTransition: function(/*transition*/) {
-      let controller = this.get('controller');
-      let characteristic = controller.get('model');
+      const controller = this.get('controller');
+      const characteristic = controller.get('model');
 
       if (characteristic.get('isNew')) {
-        characteristic.deleteRecord();
+        characteristic.destroyRecord();
       }
     },
   },
diff --git a/app/pods/protected/species/new/controller.js b/app/pods/protected/species/new/controller.js
index 1d2cecf..6170616 100644
--- a/app/pods/protected/species/new/controller.js
+++ b/app/pods/protected/species/new/controller.js
@@ -13,14 +13,16 @@ export default Ember.Controller.extend({
           ajaxError(species.get('errors'), this.get('flashMessages'));
         });
       } else {
-        species.deleteRecord().then(() => {
+        species.destroyRecord().then(() => {
           this.transitionToRoute('protected.species.index');
         });
       }
     },
 
     cancel: function() {
-      this.transitionToRoute('protected.species.index');
+      this.get('model').destroyRecord().then(() => {
+        this.transitionToRoute('protected.species.index');
+      });
     },
 
   },
diff --git a/app/pods/protected/species/new/route.js b/app/pods/protected/species/new/route.js
index d265f9e..caf8dba 100644
--- a/app/pods/protected/species/new/route.js
+++ b/app/pods/protected/species/new/route.js
@@ -18,11 +18,11 @@ export default Ember.Route.extend({
 
   actions: {
     willTransition: function(/*transition*/) {
-      let controller = this.get('controller');
-      let species = controller.get('model');
+      const controller = this.get('controller');
+      const species = controller.get('model');
 
       if (species.get('isNew')) {
-        species.deleteRecord();
+        species.destroyRecord();
       }
     },
   },
diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js
index ae093b7..2f84780 100644
--- a/app/pods/protected/strains/edit/controller.js
+++ b/app/pods/protected/strains/edit/controller.js
@@ -13,7 +13,7 @@ export default Ember.Controller.extend({
           ajaxError(strain.get('errors'), this.get('flashMessages'));
         });
       } else {
-        strain.deleteRecord().then(() => {
+        strain.destroyRecord().then(() => {
           this.transitionToRoute('protected.strains.show', strain);
         });
       }
diff --git a/app/pods/protected/strains/new/controller.js b/app/pods/protected/strains/new/controller.js
index 0d186a4..d3e1b36 100644
--- a/app/pods/protected/strains/new/controller.js
+++ b/app/pods/protected/strains/new/controller.js
@@ -13,12 +13,16 @@ export default Ember.Controller.extend({
           ajaxError(strain.get('errors'), this.get('flashMessages'));
         });
       } else {
-        this.transitionToRoute('protected.strains.index');
+        strain.destroyRecord().then(() => {
+          this.transitionToRoute('protected.strains.index');
+        });
       }
     },
 
     cancel: function() {
-      this.transitionToRoute('protected.strains.index');
+      this.get('strain').destroyRecord().then(() => {
+        this.transitionToRoute('protected.strains.index');
+      });
     },
 
   },
diff --git a/app/pods/protected/strains/new/route.js b/app/pods/protected/strains/new/route.js
index 6def196..837b713 100644
--- a/app/pods/protected/strains/new/route.js
+++ b/app/pods/protected/strains/new/route.js
@@ -25,11 +25,11 @@ export default Ember.Route.extend({
 
   actions: {
     willTransition: function(/*transition*/) {
-      let controller = this.get('controller');
-      let strain = controller.get('strain');
+      const controller = this.get('controller');
+      const strain = controller.get('strain');
 
       if (strain.get('isNew')) {
-        strain.deleteRecord();
+        strain.destroyRecord();
       }
     },
   },