From 7d6dc34124680255d509f102d7e937e329fe0a4d Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@stembolt.com>
Date: Fri, 21 Apr 2017 15:50:18 -0700
Subject: [PATCH 1/2] Add breadcrumbs for price views

---
 backend/app/views/spree/admin/prices/edit.html.erb  | 2 ++
 backend/app/views/spree/admin/prices/index.html.erb | 1 +
 backend/app/views/spree/admin/prices/new.html.erb   | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/backend/app/views/spree/admin/prices/edit.html.erb b/backend/app/views/spree/admin/prices/edit.html.erb
index 5a7b78bf500..8d4cffa9c32 100644
--- a/backend/app/views/spree/admin/prices/edit.html.erb
+++ b/backend/app/views/spree/admin/prices/edit.html.erb
@@ -1,4 +1,6 @@
 <%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
+<% admin_breadcrumb(link_to(plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product))) %>
+<% admin_breadcrumb(Spree.t('actions.edit')) %>
 
 <%= form_for @price, url: spree.admin_product_price_path(@product, @price) do |f| %>
   <fieldset>
diff --git a/backend/app/views/spree/admin/prices/index.html.erb b/backend/app/views/spree/admin/prices/index.html.erb
index f5066eed15c..cd0692cf82b 100644
--- a/backend/app/views/spree/admin/prices/index.html.erb
+++ b/backend/app/views/spree/admin/prices/index.html.erb
@@ -1,4 +1,5 @@
 <%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
+<% admin_breadcrumb(plural_resource_name(Spree::Price)) %>
 
 <% content_for :page_actions do %>
   <li id="new_price_link">
diff --git a/backend/app/views/spree/admin/prices/new.html.erb b/backend/app/views/spree/admin/prices/new.html.erb
index 07c35931f6f..979ecdf0d59 100644
--- a/backend/app/views/spree/admin/prices/new.html.erb
+++ b/backend/app/views/spree/admin/prices/new.html.erb
@@ -1,3 +1,7 @@
+<%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
+<% admin_breadcrumb(link_to(plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product))) %>
+<% admin_breadcrumb(Spree.t('actions.new')) %>
+
 <%= form_for [:admin, @product, @product.prices.build] do |f| %>
   <fieldset data-hook="admin_product_price_new_form">
     <legend><%= t('.new_price') %></legend>

From fb27e543884df4a4e8a74e460dbdb8987e199c78 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@stembolt.com>
Date: Fri, 21 Apr 2017 15:58:15 -0700
Subject: [PATCH 2/2] Remove js.erb response for prices#new

This was previously using remote: true and a js.erb template which
replaced the main body of the page with the new form. This just links to
the new url normally. If we wanted the behaviour this had, we should use
turbolinks.

This fixes a minor bug where the NumberWithCurrency JS component wasn't
being initialized on the dynamically added content. It also fixes the
breadcrumb heading.
---
 backend/app/views/spree/admin/prices/index.html.erb | 2 +-
 backend/app/views/spree/admin/prices/new.js.erb     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 backend/app/views/spree/admin/prices/new.js.erb

diff --git a/backend/app/views/spree/admin/prices/index.html.erb b/backend/app/views/spree/admin/prices/index.html.erb
index cd0692cf82b..ea6ecda4f91 100644
--- a/backend/app/views/spree/admin/prices/index.html.erb
+++ b/backend/app/views/spree/admin/prices/index.html.erb
@@ -3,7 +3,7 @@
 
 <% content_for :page_actions do %>
   <li id="new_price_link">
-    <%= button_link_to t(".new_price"), new_object_url, { remote: true, id: 'admin_new_product' } %>
+    <%= button_link_to t(".new_price"), new_object_url %>
   </li>
 <% end if can?(:create, Spree::Product) %>
 
diff --git a/backend/app/views/spree/admin/prices/new.js.erb b/backend/app/views/spree/admin/prices/new.js.erb
deleted file mode 100644
index 29df0e058b7..00000000000
--- a/backend/app/views/spree/admin/prices/new.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$(".js-content-below-tabs").html('<%= escape_javascript(render template: 'spree/admin/prices/new', formats: [:html], handlers: [:erb]) %>');
-$(".js-content-below-tabs .select2").select2();