Skip to content

Commit

Permalink
Merge pull request #11773 from eclarizio/BZ1382765
Browse files Browse the repository at this point in the history
Fix for a Dialog with Tag Control Failure
(cherry picked from commit bf2d99d)

https://bugzilla.redhat.com/show_bug.cgi?id=1385887
  • Loading branch information
gmcculloug authored and chessbyte committed Oct 17, 2016
1 parent ace1878 commit 4fe9d66
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/models/dialog_field_sorted_item.rb
Expand Up @@ -93,7 +93,7 @@ def sort_data(data_to_sort)
def raw_values
@raw_values ||= dynamic ? values_from_automate : self[:values].to_miq_a
unless @raw_values.collect { |value_pair| value_pair[0] }.include?(default_value)
self.default_value = sort_data(@raw_values).first.first
self.default_value = sort_data(@raw_values).first.try(:first)
end
self.value ||= default_value

Expand Down
20 changes: 18 additions & 2 deletions spec/models/dialog_field_drop_down_list_spec.rb
Expand Up @@ -236,11 +236,27 @@

context "when the raw values are not already set" do
before do
dialog_field.values = %w(original values)
dialog_field.values = [%w(original values)]
end

it "returns the values" do
expect(dialog_field.trigger_automate_value_updates).to eq(%w(original values))
expect(dialog_field.trigger_automate_value_updates).to eq([%w(original values)])
end

it "sets up the default value" do
dialog_field.trigger_automate_value_updates
expect(dialog_field.default_value).to eq("original")
end
end

context "when the raw values are nil" do
before do
dialog_field.values = nil
end

it "sets the default value to nil without blowing up" do
dialog_field.trigger_automate_value_updates
expect(dialog_field.default_value).to eq(nil)
end
end
end
Expand Down

0 comments on commit 4fe9d66

Please sign in to comment.