Fixes #36958 - wrap script tags in content_for(:javascripts)

theforeman · Nov 29, 2023 · 004c4d2 · 004c4d2
1 parent 740a46d
commit 004c4d2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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  %>