Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-26 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix in html reporter to create unique id for control HTML divisions using profile id as prefix (#6645)

Browse source 
Signed-off-by: Nik08 <nikita.mathur@progress.com>
This commit is contained in:
Nikita Mathur 2023-10-19 12:51:40 +05:30 committed by GitHub
parent e01043d3dd
commit 1c90448b8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/plugins/inspec-reporter-html2/templates/control.html.erb
View file

@ -1,4 +1,5 @@
<% slugged_id = control.id.tr(" ", "_") %>
<% slugged_control_id = control.id.tr(" ", "_") %>
<% slugged_profile_id = profile.name.gsub(/\W/, "_") %>
<%
if enhanced_outcomes
status = control.status
@ -13,7 +14,7 @@
end
%>
<div class="control control-status-<%= status %>" id="control-<%= slugged_id %>">
<div class="control control-status-<%= status %>" id="profile-<%= slugged_profile_id %>-control-<%= slugged_control_id %>">
<%
# Determine range of impact
@ -29,7 +30,7 @@
%>
<h3 class="control-title">Control <code><%= control.id %></code></h3>
<table class="control-metadata info" id="control-metadata-<%= slugged_id %>">
<table class="control-metadata info" id="profile-<%= slugged_profile_id %>-control-metadata-<%= slugged_control_id %>">
<caption>Control Table</caption>
<tr class="status status-<%= status %>"><th>Status:</th><td><div><%= status.capitalize %></div></td></tr>
<% if control.title %><tr class="title"><th>Title:</th><td><%= control.title %></td></tr> <% end %>
@ -64,9 +65,9 @@
<tr class="code">
<th>Source Code:</th>
<td>
<input type="button" class="show-source-code" id="show-code-<%= slugged_id %>" value="Show Source"/>
<input type="button" class="hide-source-code hidden" id="hide-code-<%= slugged_id %>" value="Hide Source"/>
<pre class="source-code hidden" id="source-code-<%= slugged_id %>">
<input type="button" class="show-source-code" id="show-code-<%= slugged_profile_id %>-<%= slugged_control_id %>" value="Show Source"/>
<input type="button" class="hide-source-code hidden" id="hide-code-<%= slugged_profile_id %>-<%= slugged_control_id %>" value="Hide Source"/>
<pre class="source-code hidden" id="source-code-<%= slugged_profile_id %>-<%= slugged_control_id %>">
<code>
<%= control.code %>
</code>

12
lib/plugins/inspec-reporter-html2/templates/default.js
View file

@ -11,17 +11,17 @@ function removeCssClass(id, cls) {
}
function handleShowSource(evt) {
var control_id = evt.srcElement.id.replace("show-code-", "")
var slugged_id = evt.srcElement.id.replace("show-code-", "")
addCssClass(evt.srcElement.id, "hidden")
removeCssClass("hide-code-" + control_id, "hidden")
removeCssClass("source-code-" + control_id, "hidden")
removeCssClass("hide-code-" + slugged_id, "hidden")
removeCssClass("source-code-" + slugged_id, "hidden")
}
function handleHideSource(evt) {
var control_id = evt.srcElement.id.replace("hide-code-", "")
var slugged_id = evt.srcElement.id.replace("hide-code-", "")
addCssClass(evt.srcElement.id, "hidden")
addCssClass("source-code-" + control_id, "hidden")
removeCssClass("show-code-" + control_id, "hidden")
addCssClass("source-code-" + slugged_id, "hidden")
removeCssClass("show-code-" + slugged_id, "hidden")
}
function handleSelectorChange(evt) {