|
1 This patch fixes the issue where fixtext sections were not being shown |
|
2 in the report and guide. |
|
3 This fix is based on the upstream community fix. |
|
4 https://github.com/OpenSCAP/openscap/commit/21e64eed9530cdabbdaa46d6ca9e61c0b30d200a |
|
5 https://github.com/OpenSCAP/openscap/commit/93261aeef2a38e69030de1c4cc7a26759b4a1c7b |
|
6 |
|
7 --- openscap-1.2.1/xsl/xccdf-guide-impl.xsl.~1~ 2015-04-16 08:17:04.104985115 -0700 |
|
8 +++ openscap-1.2.1/xsl/xccdf-guide-impl.xsl 2015-04-16 08:18:22.179921665 -0700 |
|
9 @@ -230,16 +230,25 @@ |
|
10 <xsl:call-template name="item-idents-refs"> |
|
11 <xsl:with-param name="item" select="$item"/> |
|
12 </xsl:call-template> |
|
13 + <xsl:for-each select="$item/cdf:fixtext"> |
|
14 + <span class="label label-success">Remediation description:</span> |
|
15 + <div class="panel panel-default"><div class="panel-body"> |
|
16 + <xsl:apply-templates mode="sub-testresult" select="."> |
|
17 + <xsl:with-param name="benchmark" select="$item/ancestor::cdf:Benchmark"/> |
|
18 + <xsl:with-param name="profile" select="$profile"/> |
|
19 + </xsl:apply-templates> |
|
20 + </div></div> |
|
21 + </xsl:for-each> |
|
22 |
|
23 - <xsl:if test="$item/cdf:fix"> |
|
24 + <xsl:for-each select="$item/cdf:fix"> |
|
25 <span class="label label-success">Remediation script:</span> |
|
26 <pre><code> |
|
27 - <xsl:apply-templates mode="sub-testresult" select="$item/cdf:fix"> |
|
28 + <xsl:apply-templates mode="sub-testresult" select="."> |
|
29 <xsl:with-param name="benchmark" select="$item/ancestor::cdf:Benchmark"/> |
|
30 <xsl:with-param name="profile" select="$profile"/> |
|
31 </xsl:apply-templates> |
|
32 </code></pre> |
|
33 - </xsl:if> |
|
34 + </xsl:for-each> |
|
35 </td> |
|
36 </tr> |
|
37 </xsl:if> |
|
38 --- openscap-1.2.1/xsl/xccdf-report-impl.xsl.~2~ 2015-04-16 08:50:56.877364049 -0700 |
|
39 +++ openscap-1.2.1/xsl/xccdf-report-impl.xsl 2015-04-16 08:51:17.871879194 -0700 |
|
40 @@ -680,18 +680,30 @@ |
|
41 <xsl:copy-of select="$check_system_details_ret"/> |
|
42 </div></td></tr> |
|
43 </xsl:if> |
|
44 - <xsl:if test="$item/cdf:fix"> |
|
45 + <xsl:for-each select="$item/cdf:fixtext"> |
|
46 + <tr><td colspan="2"><div class="remediation-description"> |
|
47 + <span class="label label-success">Remediation description:</span> |
|
48 + <div class="panel panel-default"><div class="panel-body"> |
|
49 + <xsl:apply-templates mode="sub-testresult" select="."> |
|
50 + <xsl:with-param name="testresult" select="$testresult"/> |
|
51 + <xsl:with-param name="benchmark" select="$item/ancestor::cdf:Benchmark"/> |
|
52 + <xsl:with-param name="profile" select="$profile"/> |
|
53 + </xsl:apply-templates> |
|
54 + </div></div> |
|
55 + </div></td></tr> |
|
56 + </xsl:for-each> |
|
57 + <xsl:for-each select="$item/cdf:fix"> |
|
58 <tr><td colspan="2"><div class="remediation"> |
|
59 <span class="label label-success">Remediation script:</span> |
|
60 <pre><code> |
|
61 - <xsl:apply-templates mode="sub-testresult" select="$item/cdf:fix"> |
|
62 + <xsl:apply-templates mode="sub-testresult" select="."> |
|
63 <xsl:with-param name="testresult" select="$testresult"/> |
|
64 <xsl:with-param name="benchmark" select="$item/ancestor::cdf:Benchmark"/> |
|
65 <xsl:with-param name="profile" select="$profile"/> |
|
66 </xsl:apply-templates> |
|
67 </code></pre> |
|
68 </div></td></tr> |
|
69 - </xsl:if> |
|
70 + </xsl:for-each> |
|
71 </xsl:if> |
|
72 </tbody> |
|
73 </table> |