From 0cfc0efe32dd5209fa9c406eb7e4dd3599593829 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 29 Nov 2013 12:32:39 +1100
Subject: [PATCH] Overriding the broken _destroy partial so failure to destroy
 is shown as intended

---
 app/views/spree/admin/shared/_destroy.js.erb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 app/views/spree/admin/shared/_destroy.js.erb

diff --git a/app/views/spree/admin/shared/_destroy.js.erb b/app/views/spree/admin/shared/_destroy.js.erb
new file mode 100644
index 0000000000..0dfb8de34b
--- /dev/null
+++ b/app/views/spree/admin/shared/_destroy.js.erb
@@ -0,0 +1,17 @@
+notice_div = $('.flash.notice');
+<% notice = flash.discard(:notice)
+if notice %>
+  if (notice_div.length > 0) {
+    notice_div.html("<%= notice %>");
+    notice_div.show();
+  } else {
+    if ($("#content .toolbar").length > 0) {
+      $("#content .toolbar").before('<div class="flash notice"><%= notice %></div>');
+    } else {
+      $("#progress").before('<div class="flash notice"><%= notice %></div>');
+    }
+  } <%
+end %>
+
+<%= render :partial => '/spree/admin/shared/update_order_state' if @order %>
+