From 74909d55eb676fbef6bbe1655c189057562d5f6e Mon Sep 17 00:00:00 2001
From: Jindong Yang
Date: Sun, 1 Apr 2012 16:59:14 +0800
Subject: [PATCH] replace Store with Spree::Store
---
app/views/spree/admin/products/_stores.html.erb | 4 ++--
app/views/spree/admin/stores/edit.html.erb | 2 +-
app/views/spree/admin/stores/new.html.erb | 2 +-
app/views/spree/admin/taxonomies/_form.html.erb | 2 +-
app/views/spree/admin/trackers/_store.html.erb | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/views/spree/admin/products/_stores.html.erb b/app/views/spree/admin/products/_stores.html.erb
index 492e2953..3ba81327 100644
--- a/app/views/spree/admin/products/_stores.html.erb
+++ b/app/views/spree/admin/products/_stores.html.erb
@@ -1,6 +1,6 @@
<%= f.label :stores, t("stores")%>
- <% Store.all.each do |store| %>
+ <% Spree::Store.all.each do |store| %>
<%= check_box_tag "product[store_ids][]", store.id, @product.stores.include?(store) %> <%= store.name %>
<% end %>
-
\ No newline at end of file
+
diff --git a/app/views/spree/admin/stores/edit.html.erb b/app/views/spree/admin/stores/edit.html.erb
index 771324aa..f45d078c 100644
--- a/app/views/spree/admin/stores/edit.html.erb
+++ b/app/views/spree/admin/stores/edit.html.erb
@@ -1,7 +1,7 @@
<%= render :partial => 'spree/admin/shared/configuration_menu' %>
<%= t("editing_store") %>
-<%= render "shared/error_messages", :target => @store %>
+<%= render "spree/shared/error_messages", :target => @store %>
<%= form_for(@store, :url => object_url, :html => { :method => :put }) do |f| %>
<%= render :partial => "form", :locals => { :f => f } %>
diff --git a/app/views/spree/admin/stores/new.html.erb b/app/views/spree/admin/stores/new.html.erb
index c4e79e1b..1c90a1cf 100644
--- a/app/views/spree/admin/stores/new.html.erb
+++ b/app/views/spree/admin/stores/new.html.erb
@@ -1,7 +1,7 @@
<%= render :partial => 'spree/admin/shared/configuration_menu' %>
<%= t("new_store") %>
-<%= render "shared/error_messages", :target => @store %>
+<%= render "spree/shared/error_messages", :target => @store %>
<%= form_for(:store, :url => collection_url) do |f| %>
<%= render :partial => "form", :locals => { :f => f } %>
diff --git a/app/views/spree/admin/taxonomies/_form.html.erb b/app/views/spree/admin/taxonomies/_form.html.erb
index 127a594d..5afeff57 100644
--- a/app/views/spree/admin/taxonomies/_form.html.erb
+++ b/app/views/spree/admin/taxonomies/_form.html.erb
@@ -8,5 +8,5 @@
<%= f.label :name, t("store") %> *
- <%= collection_select :taxonomy, :store_id, Store.all, :id, :name %>
+ <%= collection_select :taxonomy, :store_id, Spree::Store.all, :id, :name %>
diff --git a/app/views/spree/admin/trackers/_store.html.erb b/app/views/spree/admin/trackers/_store.html.erb
index ec32b5a8..16e0acce 100644
--- a/app/views/spree/admin/trackers/_store.html.erb
+++ b/app/views/spree/admin/trackers/_store.html.erb
@@ -1,6 +1,6 @@
|
- <%= collection_select(:tracker, :store_id, Store.all, :id, :name, {}) %>
+ <%= collection_select(:tracker, :store_id, Spree::Store.all, :id, :name, {}) %>
|
-
\ No newline at end of file
+