[Openvas-commits] r9249 - in trunk/openvas-manager: . src/report_formats/TXT

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2010-10-21 16:59:35 +0200 (Thu, 21 Oct 2010)
New Revision: 9249

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/report_formats/TXT/TXT.xsl
Log:
	* src/report_formats/TXT/TXT.xsl (override): Only include override when

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2010-10-21 14:37:47 UTC (rev 9248)
+++ trunk/openvas-manager/ChangeLog	2010-10-21 14:59:35 UTC (rev 9249)
@@ -1,5 +1,10 @@
-2010-10-20  Matthew Mundell <matthew.mundell at greenbone.net>
+2010-10-21  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/report_formats/TXT/TXT.xsl (override): Only include override when
+	overrides are in effect, as in other reports.
+
+2010-10-21  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	Ensure that the TXT report matches the GSA report in terms of note and
 	override information.
 

Modified: trunk/openvas-manager/src/report_formats/TXT/TXT.xsl
===================================================================
--- trunk/openvas-manager/src/report_formats/TXT/TXT.xsl	2010-10-21 14:37:47 UTC (rev 9248)
+++ trunk/openvas-manager/src/report_formats/TXT/TXT.xsl	2010-10-21 14:59:35 UTC (rev 9249)
@@ -179,27 +179,29 @@
   </xsl:template>
 
   <xsl:template match="override">
-    <xsl:text>Override from </xsl:text>
-    <xsl:choose>
-      <xsl:when test="string-length(threat) = 0">
-        <xsl:text>Any</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="threat"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text> to </xsl:text>
-    <xsl:value-of select="new_threat"/>
-    <xsl:text>:</xsl:text>
-    <xsl:call-template name="newline"/>
-    <xsl:call-template name="wrap">
-      <xsl:with-param name="string" select="text"/>
-    </xsl:call-template>
-    <xsl:text>Override last modified: </xsl:text>
-    <xsl:value-of select="modification_time"/>
-    <xsl:text>.</xsl:text>
-    <xsl:call-template name="newline"/>
-    <xsl:call-template name="newline"/>
+    <xsl:if test="/report/filters/apply_overrides/text()='1'">
+      <xsl:text>Override from </xsl:text>
+      <xsl:choose>
+        <xsl:when test="string-length(threat) = 0">
+          <xsl:text>Any</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="threat"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:text> to </xsl:text>
+      <xsl:value-of select="new_threat"/>
+      <xsl:text>:</xsl:text>
+      <xsl:call-template name="newline"/>
+      <xsl:call-template name="wrap">
+        <xsl:with-param name="string" select="text"/>
+      </xsl:call-template>
+      <xsl:text>Override last modified: </xsl:text>
+      <xsl:value-of select="modification_time"/>
+      <xsl:text>.</xsl:text>
+      <xsl:call-template name="newline"/>
+      <xsl:call-template name="newline"/>
+    </xsl:if>
   </xsl:template>
 
   <!-- Template for single issue -->