Merge pull request #7789 from MelsHyrule/catch-ui-exception-1

Resolving nil UI exception (cherry picked from commit eacb3be)
ManageIQ · Aug 23, 2021 · 3476313 · 3476313
1 parent 745a6f3
commit 3476313
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/helpers/automation_manager_helper.rb b/app/helpers/automation_manager_helper.rb
@@ -116,11 +116,10 @@ def textual_survey_group(items)
   end
 
   def textual_variables(vars)
-    return unless vars
     h = {:title     => _("Variables"),
          :headers   => [_('Name'), _('Value')],
          :col_order => %w[name value]}
-    h[:value] = vars.collect do |item|
+    h[:value] = Array(vars).collect do |item|
       {
         :name  => item[0].to_s,
         :value => item[1].to_s

diff --git a/app/views/automation_manager/_configuration_script.html.haml b/app/views/automation_manager/_configuration_script.html.haml
@@ -9,5 +9,5 @@
     :javascript
       ManageIQ.component.componentFactory('TagGroup', '#tag_group', #{textual_tags_render_data(@record).to_json});
   .col-md-12.col-lg-8
-    - if @record.survey_spec['spec']
+    - if @record.survey_spec&.dig("spec")
       = react 'TableListViewWrapper', TextualListview.data(textual_configuration_script_survey)