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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-04 19:55:52 +0100 (Fri, 04 Nov 2011)
New Revision: 12005

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/omp.xsl
Log:
	* src/html/omp.xsl (html-report-table, html-overrides-table): Add active
	column.
	(override, override [details]): Add active state.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-11-04 18:52:45 UTC (rev 12004)
+++ trunk/gsa/ChangeLog	2011-11-04 18:55:52 UTC (rev 12005)
@@ -1,3 +1,9 @@
+2011-11-04  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	* src/html/omp.xsl (html-report-table, html-overrides-table): Add active
+	column.
+	(override, override [details]): Add active state.
+
 2011-11-03  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	* src/gsad.c (request_handler): Add URL trace message.  Add favicon.ico

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-11-04 18:52:45 UTC (rev 12004)
+++ trunk/gsa/src/html/omp.xsl	2011-11-04 18:55:52 UTC (rev 12005)
@@ -2391,6 +2391,7 @@
             <td>From</td>
             <td>To</td>
             <td>Text</td>
+            <td>Active</td>
             <td width="100">Actions</td>
           </tr>
           <xsl:variable name="task_id"><xsl:value-of select="task/@id"/></xsl:variable>
@@ -9974,6 +9975,16 @@
       </xsl:choose>
     </td>
     <td>
+      <xsl:choose>
+        <xsl:when test="active='0'">
+          no
+        </xsl:when>
+        <xsl:otherwise>
+          yes
+        </xsl:otherwise>
+      </xsl:choose>
+    </td>
+    <td>
       <xsl:call-template name="delete-icon">
         <xsl:with-param name="type" select="'override'"/>
         <xsl:with-param name="id" select="@id"/>
@@ -10098,6 +10109,23 @@
           <td>Last Modified:</td>
           <td><xsl:value-of select="modification_time"/></td>
         </tr>
+        <tr>
+          <td>Active:</td>
+          <td>
+            <xsl:choose>
+              <xsl:when test="active='0'">
+                no
+              </xsl:when>
+              <xsl:when test="active='1' and end_time">
+                yes
+                <xsl:value-of select="end_time"/>
+              </xsl:when>
+              <xsl:otherwise>
+                yes
+              </xsl:otherwise>
+            </xsl:choose>
+          </td>
+        </tr>
       </table>
 
       <h1>Application</h1>
@@ -10217,6 +10245,7 @@
             <td>From</td>
             <td>To</td>
             <td>Text</td>
+            <td>Active</td>
             <td width="100">Actions</td>
           </tr>
           <xsl:apply-templates select="override"/>