From 4f579facfe7eb319ea0fbdcb7d2d3b281b9f90c2 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Tue, 6 Oct 2020 17:29:44 -0700 Subject: [PATCH] move all_units to admin helper --- app/helpers/spree/admin/general_settings_helper.rb | 4 ++++ app/views/spree/admin/general_settings/edit.html.haml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/helpers/spree/admin/general_settings_helper.rb b/app/helpers/spree/admin/general_settings_helper.rb index c1c39ea58a..29e491fe83 100644 --- a/app/helpers/spree/admin/general_settings_helper.rb +++ b/app/helpers/spree/admin/general_settings_helper.rb @@ -8,6 +8,10 @@ module Spree end options_from_collection_for_select(currencies, :first, :last, Spree::Config[:currency]) end + + def all_units + ["g", "oz", "lb", "kg", "T", "mL", "L", "kL"] + end end end end diff --git a/app/views/spree/admin/general_settings/edit.html.haml b/app/views/spree/admin/general_settings/edit.html.haml index fee1138743..df60797254 100644 --- a/app/views/spree/admin/general_settings/edit.html.haml +++ b/app/views/spree/admin/general_settings/edit.html.haml @@ -90,7 +90,6 @@ %fieldset.available_units.no-border-bottom %legend{:align => "center"}= t('admin.available_units') .field - - all_units = ["g", "oz", "lb", "kg", "T", "mL", "L", "kL"] - selected_units = Spree::Config[:available_units].split(",") - all_units.each do |unit| - selected = selected_units.include?(unit)