From d27ef76eadb0c310f0c707bbd1d93e11db74edb3 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 10 Jan 2013 11:03:35 +1100 Subject: [PATCH] Load exchange variants from correct attr --- app/assets/javascripts/admin/order_cycle.js.erb | 2 +- lib/open_food_web/order_cycle_form_applicator.rb | 2 +- spec/lib/open_food_web/order_cycle_form_applicator_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/order_cycle.js.erb b/app/assets/javascripts/admin/order_cycle.js.erb index fe6e9b8ea8..2d46bfdf19 100644 --- a/app/assets/javascripts/admin/order_cycle.js.erb +++ b/app/assets/javascripts/admin/order_cycle.js.erb @@ -61,7 +61,7 @@ angular.module('order_cycle', ['ngResource']). }, addSupplier: function(new_supplier_id) { - this.order_cycle.incoming_exchanges.push({enterprise_id: new_supplier_id, active: true}); + this.order_cycle.incoming_exchanges.push({enterprise_id: new_supplier_id, active: true, variants: {}}); }, load: function(order_cycle_id) { diff --git a/lib/open_food_web/order_cycle_form_applicator.rb b/lib/open_food_web/order_cycle_form_applicator.rb index 5b50910df0..70064eb5b0 100644 --- a/lib/open_food_web/order_cycle_form_applicator.rb +++ b/lib/open_food_web/order_cycle_form_applicator.rb @@ -51,7 +51,7 @@ module OpenFoodWeb def exchange_variant_ids(exchange) - exchange[:exchange_variants].select { |k, v| v }.keys.map { |k| k.to_i } + exchange[:variants].select { |k, v| v }.keys.map { |k| k.to_i } end end end diff --git a/spec/lib/open_food_web/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_web/order_cycle_form_applicator_spec.rb index 26804d06aa..903da566bf 100644 --- a/spec/lib/open_food_web/order_cycle_form_applicator_spec.rb +++ b/spec/lib/open_food_web/order_cycle_form_applicator_spec.rb @@ -119,7 +119,7 @@ module OpenFoodWeb it "converts exchange variant ids hash to an array of ids" do applicator = OrderCycleFormApplicator.new(nil) - applicator.send(:exchange_variant_ids, {:enterprise_id => 123, :exchange_variants => {'1' => true, '2' => false, '3' => true}}).should == [1, 3] + applicator.send(:exchange_variant_ids, {:enterprise_id => 123, :variants => {'1' => true, '2' => false, '3' => true}}).should == [1, 3] end end end