[Openvas-commits] r12159 - in trunk/gsa: . src/html

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-22 18:31:17 +0100 (Tue, 22 Nov 2011)
New Revision: 12159

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/omp.xsl
Log:
	* src/html/omp.xsl (host, report [report-assets]): Handle ISO time.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-11-22 15:40:02 UTC (rev 12158)
+++ trunk/gsa/ChangeLog	2011-11-22 17:31:17 UTC (rev 12159)
@@ -1,3 +1,7 @@
+2011-11-22  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	* src/html/omp.xsl (host, report [report-assets]): Handle ISO time.
+
 2011-11-21  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	* src/gsad_omp.c (get_report_omp): Set both overrides OMP flags from the

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-11-22 15:40:02 UTC (rev 12158)
+++ trunk/gsa/src/html/omp.xsl	2011-11-22 17:31:17 UTC (rev 12159)
@@ -11160,8 +11160,7 @@
                   </xsl:when>
                 </xsl:choose>
                 <a style="margin-left: 5px; margin-right: 5px;" href="/omp?cmd=get_report&amp;report_id={detail[name = 'report/@id' and source/name = 'openvasmd']/value}&amp;notes=1&amp;overrides={$apply-overrides}&amp;result_hosts_only=1&amp;search_phrase={ip}&amp;token={/envelope/token}">
-                  <xsl:value-of select="substring(start/text(),5,6)"/>
-                  <xsl:value-of select="substring(start/text(),20,21)"/>
+                  <xsl:value-of select="concat (date:month-abbreviation (start/text()), ' ', date:day-in-month (start/text()), ' ', date:year (start/text()))"/>
                 </a>
                 <xsl:choose>
                   <xsl:when test="$pos &gt; 1">
@@ -12394,8 +12393,7 @@
           <xsl:choose>
             <xsl:when test="../scan_start/text() != ''">
               <a href="/omp?cmd=get_report&amp;report_id={../@id}&amp;notes={../filters/notes}&amp;overrides={../filters/apply_overrides}&amp;result_hosts_only=1&amp;token={/envelope/token}">
-                <xsl:value-of select="substring(../scan_start/text(),5,6)"/>
-                <xsl:value-of select="substring(../scan_start/text(),20,21)"/>
+                <xsl:value-of select="concat (date:month-abbreviation (../scan_start/text()), ' ', date:day-in-month (../scan_start/text()), ' ', date:year (../scan_start/text()))"/>
               </a>
             </xsl:when>
             <xsl:otherwise>(not finished)</xsl:otherwise>