From 36a124c10e5448331919c72c8a7f6ac58aedb164 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Mon, 29 Jul 2013 11:49:43 +1000 Subject: [PATCH] Fix merge issues: DCV name change and application controller var name issues. --- app/controllers/application_controller.rb | 5 +++++ app/views/order_cycles/_selection.html.erb | 2 +- app/views/spree/products/_source_sidebar.html.haml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3a540b2570..fae1ff9dde 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,6 +9,10 @@ class ApplicationController < ActionController::Base @cms_site = Cms::Site.where(:identifier => 'open-food-web').first end + # This is getting sloppy, since @all_distributors is also used for order cycle selection, + # which is not in the sidebar. I don't like having an application controller method that's + # coupled to several parts of the code. We might be able to solve this using cells: + # https://github.com/apotonick/cells def load_data_for_sidebar sidebar_distributors_limit = false sidebar_suppliers_limit = false @@ -19,6 +23,7 @@ class ApplicationController < ActionController::Base @total_suppliers = Enterprise.is_primary_producer.distinct_count @sidebar_distributors = Enterprise.active_distributors.by_name.limit(sidebar_distributors_limit) + @all_distributors = Enterprise.active_distributors @total_distributors = Enterprise.is_distributor.distinct_count end diff --git a/app/views/order_cycles/_selection.html.erb b/app/views/order_cycles/_selection.html.erb index 8b349bfe54..4d81ffd361 100644 --- a/app/views/order_cycles/_selection.html.erb +++ b/app/views/order_cycles/_selection.html.erb @@ -6,7 +6,7 @@ <%= form_for current_order(true) do |f| %>

Active Hubs

- <%= f.select :distributor_id, distributor_options(@distributors, f.object.distributor_id, current_order_cycle) %> + <%= f.select :distributor_id, distributor_options(@all_distributors, f.object.distributor_id, current_order_cycle) %>
<%= f.submit 'Choose Hub' %>
diff --git a/app/views/spree/products/_source_sidebar.html.haml b/app/views/spree/products/_source_sidebar.html.haml index 3a1efc30a9..8a58a65ea1 100644 --- a/app/views/spree/products/_source_sidebar.html.haml +++ b/app/views/spree/products/_source_sidebar.html.haml @@ -3,7 +3,7 @@ %h6.filter_name Shop by Distributor %ul.filter_choices - order = current_order(false) - - validator = DistributorChangeValidator.new(order) + - validator = DistributionChangeValidator.new(order) - @sidebar_distributors.each do |distributor| %li.nowrap - if order.nil? || order.distributor == distributor || validator.can_change_to_distributor?(distributor)