From eb3086dda9f19bab59b8d9a2825af79ab6f2e6e1 Mon Sep 17 00:00:00 2001
From: Gonzalo Moreno <gmoreno@acid.cl>
Date: Thu, 18 Jun 2015 17:48:55 -0300
Subject: [PATCH] add overrides to taxonomies views fixes #134

---
 app/overrides/decorate_admin_taxonomies_form.rb  |  6 ++++++
 app/overrides/decorate_admin_taxonomies_list.rb  | 14 ++++++++++++++
 app/views/spree/admin/taxonomies/_form.html.erb  | 12 ------------
 app/views/spree/admin/taxonomies/_store.html.erb |  4 ++++
 4 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 app/overrides/decorate_admin_taxonomies_form.rb
 create mode 100644 app/overrides/decorate_admin_taxonomies_list.rb
 delete mode 100644 app/views/spree/admin/taxonomies/_form.html.erb
 create mode 100644 app/views/spree/admin/taxonomies/_store.html.erb

diff --git a/app/overrides/decorate_admin_taxonomies_form.rb b/app/overrides/decorate_admin_taxonomies_form.rb
new file mode 100644
index 00000000..84d1dba1
--- /dev/null
+++ b/app/overrides/decorate_admin_taxonomies_form.rb
@@ -0,0 +1,6 @@
+Deface::Override.new(
+  :virtual_path => "spree/admin/taxonomies/_form",
+  :name => "multi_domain_admin_taxonomies_form_store_id",
+  :insert_bottom => "[data-hook='admin_inside_taxonomy_form']",
+  :partial => "spree/admin/taxonomies/store",
+  :disabled => false)
diff --git a/app/overrides/decorate_admin_taxonomies_list.rb b/app/overrides/decorate_admin_taxonomies_list.rb
new file mode 100644
index 00000000..e8abf213
--- /dev/null
+++ b/app/overrides/decorate_admin_taxonomies_list.rb
@@ -0,0 +1,14 @@
+Deface::Override.new(
+  :virtual_path => "spree/admin/taxonomies/_list",
+  :name => "multi_domain_admin_taxonomies_list_head",
+  :insert_before => "th.actions",
+  :text => "<th><%= Spree.t(:store) %></th>",
+  :disabled => false)
+
+
+Deface::Override.new(
+  :virtual_path => "spree/admin/taxonomies/_list",
+  :name => "multi_domain_admin_taxonomies_list_body",
+  :insert_before => "td.actions",
+  :text => "<td><%= taxonomy.store.try(:name) %></td>",
+  :disabled => false)
diff --git a/app/views/spree/admin/taxonomies/_form.html.erb b/app/views/spree/admin/taxonomies/_form.html.erb
deleted file mode 100644
index 708778f1..00000000
--- a/app/views/spree/admin/taxonomies/_form.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<div data-hook="admin_inside_taxonomy_form">
-  <%= f.field_container :name do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-    <%= error_message_on :taxonomy, :name, :class => 'fullwidth title'  %>
-    <%= text_field :taxonomy, :name  %>
-  <% end %>
-</div>
-
-<p>
-  <%= f.label :name, Spree.t(:store) %> <span class="required">*</span><br />
-  <%= collection_select :taxonomy, :store_id, Spree::Store.all, :id, :name  %>
-</p>
diff --git a/app/views/spree/admin/taxonomies/_store.html.erb b/app/views/spree/admin/taxonomies/_store.html.erb
new file mode 100644
index 00000000..b8b01019
--- /dev/null
+++ b/app/views/spree/admin/taxonomies/_store.html.erb
@@ -0,0 +1,4 @@
+<%= f.field_container :store_id, class: ['form-group'] do %>
+  <%= f.label :name, Spree.t(:store) %> <span class="required">*</span>
+  <%= f.collection_select(:store_id, Spree::Store.all, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+<% end %>
\ No newline at end of file