From c49242a8a51f16635f67acd850b3bbcd6ad2ac5e Mon Sep 17 00:00:00 2001 From: Zog Date: Tue, 29 May 2018 11:01:23 +0200 Subject: Refs #7159; Rename Export#export_subtype to export_type --- app/helpers/exports_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb index c095419bb..0f322f855 100644 --- a/app/helpers/exports_helper.rb +++ b/app/helpers/exports_helper.rb @@ -18,7 +18,7 @@ module ExportsHelper opts = { required: option_def[:required], input_html: {value: export.try(attr) || option_def[:default_value]}, as: option_def[:type], selected: export.try(attr) || option_def[:default_value]} if option_def.has_key?(:collection) - if option_def[:collection].is_a? Array + if option_def[:collection].is_a?(Array) && !option_def[:collection].first.is_a?(Array) opts[:collection] = option_def[:collection].map{|k| [export.class.tmf("#{type.name.demodulize.underscore}.#{attr}_collection.#{k}"), k]} else opts[:collection] = option_def[:collection] -- cgit v1.2.3