Merge pull request ManageIQ#13994 from eclarizio/cascading_auto_refre…

…sh_critical_fix_euwe_backport [EUWE] Make cascading auto-refresh behavior more consistent with how it was previously
romanblanco · Feb 21, 2017 · 818f133 · 818f133
2 parents 99e55b2 + b89f5b5
commit 818f133
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 6 deletions.
diff --git a/app/helpers/application_helper/dialogs.rb b/app/helpers/application_helper/dialogs.rb
@@ -131,6 +131,10 @@ def build_auto_refreshable_field_indicies(workflow)
     auto_refreshable_field_indicies
   end
 
+  def auto_refresh_listening_options(options, trigger_override)
+    options.merge(:trigger => trigger_override)
+  end
+
   private
 
   def auto_refresh_options(field, auto_refresh_options_hash)

diff --git a/app/views/shared/dialogs/_dialog_field_check_box.html.haml b/app/views/shared/dialogs/_dialog_field_check_box.html.haml
@@ -5,7 +5,9 @@
     :javascript
       dialogFieldRefresh.listenForAutoRefreshMessages(JSON.parse("#{j(auto_refresh_options.to_json)}"), function() {
         dialogFieldRefresh.refreshCheckbox("#{field.name}", "#{field.id}", function() {
-          dialogFieldRefresh.triggerAutoRefresh(JSON.parse('#{j(auto_refresh_options.to_json)}'));
+          dialogFieldRefresh.triggerAutoRefresh(
+            JSON.parse('#{j(auto_refresh_listening_options(auto_refresh_options, true).to_json)}')
+          );
         });
       });
 

diff --git a/app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml b/app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml
@@ -27,7 +27,9 @@
     :javascript
       dialogFieldRefresh.listenForAutoRefreshMessages(JSON.parse("#{j(auto_refresh_options.to_json)}"), function() {
         dialogFieldRefresh.refreshDateTime("#{field.name}", "#{field.id}", function() {
-          dialogFieldRefresh.triggerAutoRefresh(JSON.parse('#{j(auto_refresh_options.to_json)}'));
+          dialogFieldRefresh.triggerAutoRefresh(
+            JSON.parse('#{j(auto_refresh_listening_options(auto_refresh_options, true).to_json)}')
+          );
         });
       });
 

diff --git a/app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml b/app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml
@@ -17,7 +17,9 @@
         dialogFieldRefresh.listenForAutoRefreshMessages(JSON.parse("#{j(auto_refresh_options.to_json)}"), function() {
           var selectedValue = $('select[name="#{field.name}"]').val();
           dialogFieldRefresh.refreshDropDownList("#{field.name}", "#{field.id}", selectedValue, function() {
-            dialogFieldRefresh.triggerAutoRefresh(JSON.parse('#{j(auto_refresh_options.to_json)}'));
+            dialogFieldRefresh.triggerAutoRefresh(
+              JSON.parse('#{j(auto_refresh_listening_options(auto_refresh_options, true).to_json)}')
+            );
           });
         });
 

diff --git a/app/views/shared/dialogs/_dialog_field_radio_button.html.haml b/app/views/shared/dialogs/_dialog_field_radio_button.html.haml
@@ -32,7 +32,9 @@
                                             checkedValue,
                                             "#{url}",
                                             JSON.parse('#{j(auto_refresh_options.to_json)}'), function() {
-          dialogFieldRefresh.triggerAutoRefresh(JSON.parse('#{j(auto_refresh_options.to_json)}'));
+          dialogFieldRefresh.triggerAutoRefresh(
+            JSON.parse('#{j(auto_refresh_listening_options(auto_refresh_options, true).to_json)}')
+          );
         });
       });
 

diff --git a/app/views/shared/dialogs/_dialog_field_text_area_box.html.haml b/app/views/shared/dialogs/_dialog_field_text_area_box.html.haml
@@ -8,7 +8,9 @@
     :javascript
       dialogFieldRefresh.listenForAutoRefreshMessages(JSON.parse("#{j(auto_refresh_options.to_json)}"), function() {
         dialogFieldRefresh.refreshTextAreaBox("#{field.name}", "#{field.id}", function() {
-          dialogFieldRefresh.triggerAutoRefresh(JSON.parse('#{j(auto_refresh_options.to_json)}'));
+          dialogFieldRefresh.triggerAutoRefresh(
+            JSON.parse('#{j(auto_refresh_listening_options(auto_refresh_options, true).to_json)}')
+          );
         });
       });
 

diff --git a/app/views/shared/dialogs/_dialog_field_text_box.html.haml b/app/views/shared/dialogs/_dialog_field_text_box.html.haml
@@ -9,7 +9,9 @@
       :javascript
         dialogFieldRefresh.listenForAutoRefreshMessages(JSON.parse('#{j(auto_refresh_options.to_json)}'), function() {
           dialogFieldRefresh.refreshTextBox("#{field.name}", "#{field.id}", function() {
-            dialogFieldRefresh.triggerAutoRefresh(JSON.parse('#{j(auto_refresh_options.to_json)}'));
+            dialogFieldRefresh.triggerAutoRefresh(
+              JSON.parse('#{j(auto_refresh_listening_options(auto_refresh_options, true).to_json)}')
+            );
           });
         });
 

diff --git a/spec/helpers/application_helper/dialogs_spec.rb b/spec/helpers/application_helper/dialogs_spec.rb
@@ -498,4 +498,12 @@
       ])
     end
   end
+
+  describe "#auto_refresh_listening_options" do
+    let(:options) { {:trigger => false} }
+
+    it "overrides the trigger attribute" do
+      expect(helper.auto_refresh_listening_options(options, true)).to eq(:trigger => true)
+    end
+  end
 end