WIP

app/controllers/collections/detail/edit.js

@@ -12,6 +12,7 @@ export default Controller.extend(ValidationMixin, {
   DatasheetValidations,
 
   hasMany: ['collectionSpecies', 'datasheets'],
+  safeNavigate: false,
 
   options: computed('projectOptions', 'studyLocationOptions',
                     'collectionTypeOptions', 'collectionMethodOptions',
@@ -29,15 +30,21 @@ export default Controller.extend(ValidationMixin, {
   actions: {
     onSave(changesets) {
       const postSave = () => {
+        this.set('safeNavigate', true);
         // Use the model's ID here because of the ArrayProxy in the route
         this.transitionToRoute('collections.detail', this.get('model.id'));
+        this.set('safeNavigate', false);
+        console.log('save');
       };
       return this.validationSave(changesets, postSave);
     },
     onCancel(changesets) {
       const postCancel = () => {
+        this.set('safeNavigate', true);
         // Use the model's ID here because of the ArrayProxy in the route
-        return this.transitionToRoute('collections.detail', this.get('model.id'));
+        this.transitionToRoute('collections.detail', this.get('model.id'));
+        this.set('safeNavigate', false);
+        console.log('cancel');
       };
       return this.validationCancel(changesets, postCancel);
     },

app/mixins/cleanup-form.js

@@ -5,6 +5,7 @@ const { Mixin, run: { once } } = Ember;
 export default Mixin.create({
   actions: {
     willTransition(transition) {
+      if (!this.get('controller.safeNavigate')) {
         if (confirm('Any unsaved changes will be discarded.')) {
           let model = this.get('controller.model');
           let hasMany = this.get('controller.hasMany');
@@ -25,8 +26,11 @@ export default Mixin.create({
             model.deleteRecord();
           }
         } else {
-        return false;
+          transition.abort();
+          return false
         }
+      }
+      return true;
     },
   },
 });

config/environment.js

@@ -26,6 +26,7 @@ module.exports = function(environment) {
   if (environment === 'development') {
     ENV.APP.API_HOST = 'http://localhost:8000';
     ENV.APP.API_NAMESPACE = 'api/v1';
+    ENV.APP.LOG_TRANSITIONS = true;
   }
 
   if (environment === 'test') {