diff --git a/app/models/miq_alert.rb b/app/models/miq_alert.rb index 2b54af7b020..496f8fbcee6 100644 --- a/app/models/miq_alert.rb +++ b/app/models/miq_alert.rb @@ -195,7 +195,7 @@ def self.evaluate_hourly_timer end def evaluate_queue(targets, inputs = {}) - targets.to_miq_a.each do |target| + Array.wrap(targets).each do |target| zone = target.respond_to?(:my_zone) ? target.my_zone : MiqServer.my_zone MiqQueue.put_unless_exists( :class_name => self.class.name, @@ -316,7 +316,7 @@ def build_actions notifications = (self.options ||= {})[:notifications] notifications.each_key do |k| if k == :email - notifications[k].to_miq_a.each do |n| + Array.wrap(notifications[k]).each do |n| n[:to].each do |to| description = "#{k.to_s.titleize} Action To: [#{to}] for Alert: #{self.description}" actions << MiqAction.new( diff --git a/app/models/miq_report/generator/aggregation.rb b/app/models/miq_report/generator/aggregation.rb index 4faf5de20cf..80ecf0e7f71 100644 --- a/app/models/miq_report/generator/aggregation.rb +++ b/app/models/miq_report/generator/aggregation.rb @@ -8,7 +8,7 @@ def build_subtotals(all_dims = false) end def generate_subtotals(table, group_keys, options) - gkeys = group_keys.to_miq_a + gkeys = group_keys.kind_of?(String) ? group_keys.lines : Array.wrap(group_keys) totals = {:count => 0, :row => {}} group = {:count => 0, :row => {}} result = {} diff --git a/app/models/miq_report/generator/sorting.rb b/app/models/miq_report/generator/sorting.rb index d3516c2970c..5a4d1f02944 100644 --- a/app/models/miq_report/generator/sorting.rb +++ b/app/models/miq_report/generator/sorting.rb @@ -45,7 +45,7 @@ def build_sort_table def build_sort_suffix_data new_sortby = [] - rpt_sortby = sortby.to_miq_a + rpt_sortby = Array.wrap(sortby) rpt_sortby.each do |sb| col, sfx = sb.split("__") if sfx && self.class.is_break_suffix?(sfx) diff --git a/app/models/miq_request_task/dumping.rb b/app/models/miq_request_task/dumping.rb index ec918b5a43c..34761a09215 100644 --- a/app/models/miq_request_task/dumping.rb +++ b/app/models/miq_request_task/dumping.rb @@ -34,7 +34,7 @@ def dump_vim_array(ad, prefix, print_obj, print_method, &block) def dump_obj(obj, prefix = nil, print_obj = STDOUT, print_method = :puts, options = {}) self.class.dump_obj(obj, prefix, print_obj, print_method) do |val, key| value = val - if options.try(:[], :protected).try(:[], :path).to_miq_a.any? { |filter| key =~ filter } + if Array.wrap(options.try(:[], :protected).try(:[], :path)).any? { |filter| key =~ filter } value = "" end print_obj.send(print_method, "#{key}(#{val.class}) = #{value.inspect}") diff --git a/app/models/mixins/relationship_mixin.rb b/app/models/mixins/relationship_mixin.rb index 5004e6f9599..480bd798f9c 100644 --- a/app/models/mixins/relationship_mixin.rb +++ b/app/models/mixins/relationship_mixin.rb @@ -640,7 +640,7 @@ def remove_all_parents(*args) def remove_all_children(*args) # Determine if we are removing all or some children options = args.last.kind_of?(Hash) ? args.last : {} - of_type = options[:of_type].to_miq_a + of_type = Array.wrap(options[:of_type]) all_children_removed = of_type.empty? || (child_types - of_type).empty? if self.is_root? && all_children_removed diff --git a/lib/miq_expression.rb b/lib/miq_expression.rb index b0692176ef3..73b59f36721 100644 --- a/lib/miq_expression.rb +++ b/lib/miq_expression.rb @@ -638,7 +638,7 @@ def self.quote(val, typ) val.to_s.to_f_with_method when "numeric_set" val = val.split(",") if val.kind_of?(String) - v_arr = val.to_miq_a.flat_map do |v| + v_arr = Array.wrap(val).flat_map do |v| if v.kind_of?(String) v = begin eval(v) @@ -651,7 +651,7 @@ def self.quote(val, typ) "[#{v_arr.join(",")}]" when "string_set" val = val.split(",") if val.kind_of?(String) - v_arr = val.to_miq_a.flat_map { |v| "'#{v.to_s.strip}'" }.uniq.sort + v_arr = Array.wrap(val).flat_map { |v| "'#{v.to_s.strip}'" }.uniq.sort "[#{v_arr.join(",")}]" else val @@ -1089,7 +1089,7 @@ def self.atom_error(field, operator, value) when :date, :datetime return false if operator.downcase.include?("empty") - values = value.to_miq_a + values = value.kind_of?(String) ? value.lines : Array.wrap(value) return _("No Date/Time value specified") if values.empty? || values.include?(nil) return _("Two Date/Time values must be specified") if operator.downcase == "from" && values.length < 2