Fix issue where default value was always being used

https://bugzilla.redhat.com/show_bug.cgi?id=1219950 Use nil instead of "" as initial value Use @default_value instead of default_value as that was nil
ManageIQ · May 29, 2015 · d0bb218 · d0bb218
1 parent 0089ecd
commit d0bb218
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/vmdb/app/models/dialog_field_drop_down_list.rb b/vmdb/app/models/dialog_field_drop_down_list.rb
@@ -13,7 +13,7 @@ def show_refresh_button?
   end
 
   def initial_values
-    [["", "<None>"]]
+    [[nil, "<None>"]]
   end
 
   def refresh_json_value(checked_value)
@@ -24,7 +24,7 @@ def refresh_json_value(checked_value)
     if refreshed_values.collect { |value_pair| value_pair[0].to_s }.include?(checked_value)
       @value = checked_value
     else
-      @value = default_value
+      @value = @default_value
     end
 
     {:refreshed_values => refreshed_values, :checked_value => @value}
@@ -40,7 +40,7 @@ def load_values_on_init?
   def raw_values
     @raw_values ||= dynamic ? values_from_automate : super
     @default_value ||= sort_data(@raw_values).first.first
-    self.value = @default_value
+    self.value ||= @default_value
 
     @raw_values
   end