From 004c4d20160ec9bd0c7d06d04c5192808f62e9b0 Mon Sep 17 00:00:00 2001
From: MariaAga <mariaaga@redhat.com>
Date: Wed, 29 Nov 2023 16:44:58 +0100
Subject: [PATCH] Fixes #36958 - wrap script tags in content_for(:javascripts)

---
 app/views/hosts/console/spice.html.erb          |  7 +++++--
 app/views/report_templates/report_data.html.erb | 10 +++++-----
 app/views/users/_form.html.erb                  | 12 +++++++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/views/hosts/console/spice.html.erb b/app/views/hosts/console/spice.html.erb
index 91de1bb8648..25ae7429c6e 100644
--- a/app/views/hosts/console/spice.html.erb
+++ b/app/views/hosts/console/spice.html.erb
@@ -14,5 +14,8 @@
   </div>
   <div id="spice-screen" class="console-screen"> </div>
 <% end %>
-
-<script type="text/javascript"> tfm.spice.startSpice() </script>
+<% content_for(:javascripts) do -%>
+  <script type="text/javascript">
+    tfm.spice.startSpice()
+  </script>
+<% end -%>
diff --git a/app/views/report_templates/report_data.html.erb b/app/views/report_templates/report_data.html.erb
index 25ab1844510..949819ff638 100644
--- a/app/views/report_templates/report_data.html.erb
+++ b/app/views/report_templates/report_data.html.erb
@@ -1,7 +1,7 @@
 <% title _("Download generated report") %>
-
 <%= react_component('TemplateGenerator', data: { templateName: @template.name }) %>
-
-<script type="text/javascript">
-  tfm.templateInputs.pollReportData('<%= @data_url %>');
-</script>
+<% content_for(:javascripts) do -%>
+  <script type="text/javascript">
+    tfm.templateInputs.pollReportData('<%= @data_url %>');
+  </script>
+<% end -%>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 16a6895c9f3..04328e2e7e7 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -140,9 +140,11 @@
 <% end %>
 
 <% if @user.cached_usergroups.any? %>
-  <script>
-      $(function() {
-        tfm.users.initInheritedRoles();
-      });
-  </script>
+  <% content_for(:javascripts) do -%>
+    <script>
+        $(function() {
+          tfm.users.initInheritedRoles();
+        });
+    </script>
+  <% end  -%>
 <% end  %>