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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-09-19 09:33:00 +0200 (Mon, 19 Sep 2011)
New Revision: 11629

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/gsad.c
   trunk/gsa/src/html/omp.xsl
Log:
	Add multi-host prognosis report.

	* src/gsad.c (init_validator): Add host_levels alias.

	* src/html/omp.xsl (html-report-details): Correct path in Back to Assets
	link.
	(report [assets]): Pass Back to Assets link levels in host_levels.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-09-19 07:03:54 UTC (rev 11628)
+++ trunk/gsa/ChangeLog	2011-09-19 07:33:00 UTC (rev 11629)
@@ -1,3 +1,13 @@
+2011-09-19  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	Add multi-host prognosis report.
+
+	* src/gsad.c (init_validator): Add host_levels alias.
+
+	* src/html/omp.xsl (html-report-details): Correct path in Back to Assets
+	link.
+	(report [assets]):
+
 2011-09-16  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	Add multi-host prognosis report.

Modified: trunk/gsa/src/gsad.c
===================================================================
--- trunk/gsa/src/gsad.c	2011-09-19 07:03:54 UTC (rev 11628)
+++ trunk/gsa/src/gsad.c	2011-09-19 07:33:00 UTC (rev 11629)
@@ -663,8 +663,9 @@
   openvas_validator_alias (validator, "esc_min_cvss_base", "min_cvss_base");
   openvas_validator_alias (validator, "esc_search_phrase", "search_phrase");
   openvas_validator_alias (validator, "host_search_phrase", "search_phrase");
-  openvas_validator_alias (validator, "host_first_result", "first_result");
-  openvas_validator_alias (validator, "host_max_results", "max_results");
+  openvas_validator_alias (validator, "host_first_result",  "first_result");
+  openvas_validator_alias (validator, "host_max_results",   "max_results");
+  openvas_validator_alias (validator, "host_levels",        "levels");
   openvas_validator_alias (validator, "refresh_interval", "number");
   openvas_validator_alias (validator, "event",        "condition");
   openvas_validator_alias (validator, "access_hosts", "hosts_opt");

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-09-19 07:03:54 UTC (rev 11628)
+++ trunk/gsa/src/html/omp.xsl	2011-09-19 07:33:00 UTC (rev 11629)
@@ -877,7 +877,7 @@
       <xsl:choose>
         <xsl:when test="@type='prognostic'">
           <div class="float_right">
-            <a href="?cmd=get_report&amp;type=assets&amp;levels={../host_levels}&amp;search_phrase={../../host_search_phrase}&amp;first_result={../../results/@start}&amp;max_results={../../results/@max}&amp;token={/envelope/token}">Back to Assets</a>
+            <a href="?cmd=get_report&amp;type=assets&amp;levels={../../host_levels}&amp;search_phrase={../../host_search_phrase}&amp;first_result={../../results/@start}&amp;max_results={../../results/@max}&amp;token={/envelope/token}">Back to Assets</a>
           </div>
         </xsl:when>
         <xsl:otherwise>
@@ -11544,7 +11544,7 @@
              title="Asset Details" style="margin-left:3px;">
             <img src="/img/details.png" border="0" alt="Details"/>
           </a>
-          <a href="/omp?cmd=get_report&amp;type=prognostic&amp;host={ip}&amp;pos=1&amp;host_search_phrase={../filters/phrase}&amp;levels={gsa:build-levels(../filters)}&amp;host_first_result={../hosts/@start}&amp;host_max_results={../hosts/@max}&amp;token={/envelope/token}"
+          <a href="/omp?cmd=get_report&amp;type=prognostic&amp;host={ip}&amp;pos=1&amp;host_search_phrase={../filters/phrase}&amp;host_levels={gsa:build-levels(../filters)}&amp;host_first_result={../hosts/@start}&amp;host_max_results={../hosts/@max}&amp;token={/envelope/token}"
              title="Prognostic Report" style="margin-left:3px;">
             <img src="/img/new.png" border="0" alt="Prognostic Report"/>
           </a>