From efae9265c12b6bb942fb39007caf633c08d099b0 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Wed, 26 Nov 2014 13:08:16 +1100 Subject: [PATCH] Inject variant overrides --- app/controllers/spree/admin/products_controller_decorator.rb | 5 ++--- app/helpers/admin/injection_helper.rb | 4 ++++ .../spree/admin/products/override_variants/_data.html.haml | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/spree/admin/products_controller_decorator.rb b/app/controllers/spree/admin/products_controller_decorator.rb index 4d18b5500a..00742bdbec 100644 --- a/app/controllers/spree/admin/products_controller_decorator.rb +++ b/app/controllers/spree/admin/products_controller_decorator.rb @@ -51,11 +51,10 @@ Spree::Admin::ProductsController.class_eval do def override_variants @hubs = order_cycle_hub_enterprises(without_validation: true) - + @producers = order_cycle_producer_enterprises @hub_permissions = OpenFoodNetwork::Permissions.new(spree_current_user). order_cycle_enterprises_per_hub - - @producers = order_cycle_producer_enterprises + @variant_overrides = VariantOverride.for_hubs(@hubs) end diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb index 524bbb5a03..f01f9b9b01 100644 --- a/app/helpers/admin/injection_helper.rb +++ b/app/helpers/admin/injection_helper.rb @@ -49,6 +49,10 @@ module Admin admin_inject_json_ams_array "ofn.admin", "users", @users, Api::Admin::UserSerializer end + def admin_inject_variant_overrides + admin_inject_json_ams_array "ofn.admin", "variantOverrides", @variant_overrides, Api::Admin::VariantOverrideSerializer + end + def admin_inject_spree_api_key render partial: "admin/json/injection_ams", locals: {ngModule: 'ofn.admin', name: 'SpreeApiKey', json: "'#{@spree_api_key.to_s}'"} end diff --git a/app/views/spree/admin/products/override_variants/_data.html.haml b/app/views/spree/admin/products/override_variants/_data.html.haml index 6d04309e4d..3b5f7f125c 100644 --- a/app/views/spree/admin/products/override_variants/_data.html.haml +++ b/app/views/spree/admin/products/override_variants/_data.html.haml @@ -2,3 +2,4 @@ = admin_inject_hubs = admin_inject_hub_permissions = admin_inject_producers += admin_inject_variant_overrides