From ce546960a487ee36450b15481e2c1ad044f29dcd Mon Sep 17 00:00:00 2001
From: Jake Goldsborough <rjgoldsborough@gmail.com>
Date: Mon, 29 Aug 2016 18:30:01 -0700
Subject: [PATCH 1/2] making ember return an error but not redirect if crate
 not found

---
 app/routes/crate.js             | 5 ++---
 app/templates/crate/version.hbs | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/routes/crate.js b/app/routes/crate.js
index 62b25bfc466..39df0e906fc 100644
--- a/app/routes/crate.js
+++ b/app/routes/crate.js
@@ -4,9 +4,8 @@ export default Ember.Route.extend({
     model(params) {
         return this.store.find('crate', params.crate_id).catch(e => {
             if (e.errors.any(e => e.detail === 'Not Found')) {
-                this.controllerFor('application').set('nextFlashError', `Crate '${params.crate_id}' does not exist`);
-                return this.replaceWith('index');
+                throw new Error(`${params.crate_id} not found`);
             }
         });
-    },
+    }
 });
diff --git a/app/templates/crate/version.hbs b/app/templates/crate/version.hbs
index 387028df3e3..960c0507ff0 100644
--- a/app/templates/crate/version.hbs
+++ b/app/templates/crate/version.hbs
@@ -244,3 +244,5 @@
     </div>
 </div>
 {{/if}}
+
+{{ outlet }}

From 78f2227e11c2518bcd5562e9e7d336e72c51267d Mon Sep 17 00:00:00 2001
From: Jake Goldsborough <rjgoldsborough@gmail.com>
Date: Tue, 30 Aug 2016 11:20:08 -0700
Subject: [PATCH 2/2] making app use flash error and adding error substate
 template to ember

---
 app/routes/crate.js             | 2 +-
 app/templates/crate/error.hbs   | 1 +
 app/templates/crate/version.hbs | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 app/templates/crate/error.hbs

diff --git a/app/routes/crate.js b/app/routes/crate.js
index 39df0e906fc..421802b3eee 100644
--- a/app/routes/crate.js
+++ b/app/routes/crate.js
@@ -4,7 +4,7 @@ export default Ember.Route.extend({
     model(params) {
         return this.store.find('crate', params.crate_id).catch(e => {
             if (e.errors.any(e => e.detail === 'Not Found')) {
-                throw new Error(`${params.crate_id} not found`);
+                return this.controllerFor('application').set('flashError', `Crate '${params.crate_id}' does not exist`);
             }
         });
     }
diff --git a/app/templates/crate/error.hbs b/app/templates/crate/error.hbs
new file mode 100644
index 00000000000..31348e1f2c5
--- /dev/null
+++ b/app/templates/crate/error.hbs
@@ -0,0 +1 @@
+{{ title 'Crate Not Found' }}
diff --git a/app/templates/crate/version.hbs b/app/templates/crate/version.hbs
index 960c0507ff0..387028df3e3 100644
--- a/app/templates/crate/version.hbs
+++ b/app/templates/crate/version.hbs
@@ -244,5 +244,3 @@
     </div>
 </div>
 {{/if}}
-
-{{ outlet }}