From 129c4c92fabe4b815d634babe3d5240c3ca983ba Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 29 Sep 2021 17:41:52 +1000 Subject: [PATCH] Catch JS error on OC page Calling `when variant.id in enterprise_rules` raised an error when enterprise_rules was null. Fixing this then revealed a missing require statement in a controller. --- .../admin/order_cycles/filters/visible_variants.js.coffee | 6 +++++- app/controllers/admin/enterprise_fees_controller.rb | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee b/app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee index db261ebcea..2dc025982e 100644 --- a/app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee @@ -1,3 +1,7 @@ angular.module("admin.orderCycles").filter "visibleVariants", -> return (variants, exchange, rules) -> - return (variant for variant in variants when variant.id in rules[exchange.enterprise_id]) + enterprise_rules = rules[exchange.enterprise_id] + if enterprise_rules + (variant for variant in variants when variant.id in enterprise_rules) + else + [] diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb index 54a320785f..2b4852a613 100644 --- a/app/controllers/admin/enterprise_fees_controller.rb +++ b/app/controllers/admin/enterprise_fees_controller.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'open_food_network/order_cycle_permissions' + module Admin class EnterpriseFeesController < Admin::ResourceController before_action :load_enterprise_fee_set, only: :index