Skip to content

Commit

Permalink
Merge pull request spree-contrib#11 from yangjindong/master
Browse files Browse the repository at this point in the history
Replace Store with Spree::Store
  • Loading branch information
radar committed Apr 1, 2012
2 parents 7b35ebb + 74909d5 commit 55901c6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions app/views/spree/admin/products/_stores.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p>
<%= f.label :stores, t("stores")%><br />
<% 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 %>
</p>
</p>
2 changes: 1 addition & 1 deletion app/views/spree/admin/stores/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%= render :partial => 'spree/admin/shared/configuration_menu' %>

<h1><%= t("editing_store") %></h1>
<%= 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 } %>
<p class="form-buttons">
Expand Down
2 changes: 1 addition & 1 deletion app/views/spree/admin/stores/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%= render :partial => 'spree/admin/shared/configuration_menu' %>

<h1><%= t("new_store") %></h1>
<%= 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 } %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/spree/admin/taxonomies/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@

<p>
<%= f.label :name, t("store") %> <span class="required">*</span><br />
<%= collection_select :taxonomy, :store_id, Store.all, :id, :name %>
<%= collection_select :taxonomy, :store_id, Spree::Store.all, :id, :name %>
</p>
4 changes: 2 additions & 2 deletions app/views/spree/admin/trackers/_store.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<tr>
<td><label><%=t("store")%></label></td>
<td>
<%= collection_select(:tracker, :store_id, Store.all, :id, :name, {}) %>
<%= collection_select(:tracker, :store_id, Spree::Store.all, :id, :name, {}) %>
</td>
</tr>
</tr>

0 comments on commit 55901c6

Please sign in to comment.