Fixes #35172 - Do not crash if report template missing

theforeman · Jul 13, 2022 · da4b4d1 · da4b4d1
1 parent 2d45583
commit da4b4d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/helpers/remote_execution_helper.rb b/app/helpers/remote_execution_helper.rb
@@ -246,7 +246,7 @@ def load_template_from_task(template_invocation, target)
   def job_report_template
     template = ReportTemplate.where(name: Setting['remote_execution_job_invocation_report_template']).first
 
-    template if template.template_inputs.where(name: 'job_id').exists?
+    template if template && template.template_inputs.where(name: 'job_id').exists?
   end
 
   def job_report_template_parameters(job_invocation, template)

diff --git a/test/helpers/remote_execution_helper_test.rb b/test/helpers/remote_execution_helper_test.rb
@@ -37,5 +37,9 @@ class RemoteExecutionHelperTest < ActionView::TestCase
 
       assert_equal template.id, found_template.id
     end
+
+    it 'should not crash if the template cannot be found' do
+      assert_nil job_report_template
+    end
   end
 end