[Openvas-commits] r12200 - in trunk/gsa: . src/html
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Nov 25 18:03:39 CET 2011
Author: mattm
Date: 2011-11-25 18:03:39 +0100 (Fri, 25 Nov 2011)
New Revision: 12200
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/omp.xsl
Log:
* src/html/omp.xsl (note-detailed-delete-params)
(override-detailed-delete-params): New templates.
(note-detailed, override-detailed): Call new template to put down the
delete icon params. Use the correct base path for result 2, which is more
deeply nested. Adjust the paths similarly in the edit icon link. This
ensures that the parameters are added to the icons on result 2.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2011-11-25 16:41:37 UTC (rev 12199)
+++ trunk/gsa/ChangeLog 2011-11-25 17:03:39 UTC (rev 12200)
@@ -1,5 +1,14 @@
2011-11-25 Matthew Mundell <matthew.mundell at greenbone.net>
+ * src/html/omp.xsl (note-detailed-delete-params)
+ (override-detailed-delete-params): New templates.
+ (note-detailed, override-detailed): Call new template to put down the
+ delete icon params. Use the correct base path for result 2, which is more
+ deeply nested. Adjust the paths similarly in the edit icon link. This
+ ensures that the parameters are added to the icons on result 2.
+
+2011-11-25 Matthew Mundell <matthew.mundell at greenbone.net>
+
* src/gsad_omp.c (edit_override_omp): Add delta params.
(save_override_omp): Call get_report instead of getting the report by hand.
This means the delta case is now handled properly.
Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl 2011-11-25 16:41:37 UTC (rev 12199)
+++ trunk/gsa/src/html/omp.xsl 2011-11-25 17:03:39 UTC (rev 12200)
@@ -11599,6 +11599,22 @@
<!-- NOTE -->
+<xsl:template name="note-detailed-delete-params">
+ <xsl:param name="base" select="."/>
+ <input type="hidden" name="report_id" value="{$base/@id}"/>
+ <input type="hidden" name="first_result" value="{$base/results/@start}"/>
+ <input type="hidden" name="max_results" value="{$base/results/@max}"/>
+ <input type="hidden" name="levels" value="{$base/filters/text()}"/>
+ <input type="hidden" name="sort_field" value="{$base/sort/field/text()}"/>
+ <input type="hidden" name="sort_order" value="{$base/sort/field/order}"/>
+ <input type="hidden" name="search_phrase" value="{$base/filters/phrase}"/>
+ <input type="hidden" name="min_cvss_base" value="{$base/filters/min_cvss_base}"/>
+ <input type="hidden" name="apply_min_cvss_base" value="{number (string-length ($base/filters/min_cvss_base) > 0)}"/>
+ <input type="hidden" name="notes" value="{$base/filters/notes}"/>
+ <input type="hidden" name="overrides" value="{$base/filters/apply_overrides}"/>
+ <input type="hidden" name="result_hosts_only={$base/filters/result_hosts_only}"/>
+</xsl:template>
+
<xsl:template name="note-detailed" match="note" mode="detailed">
<xsl:param name="note-buttons">1</xsl:param>
<xsl:param name="delta"/>
@@ -11653,23 +11669,26 @@
<input type="hidden" name="result_hosts_only={../../../../../../filters/result_hosts_only}"/>
</xsl:when>
<xsl:otherwise>
- <input type="hidden" name="report_id" value="{../../../../@id}"/>
- <input type="hidden" name="first_result" value="{../../../../results/@start}"/>
- <input type="hidden" name="max_results" value="{../../../../results/@max}"/>
- <input type="hidden" name="levels" value="{../../../../filters/text()}"/>
- <input type="hidden" name="sort_field" value="{../../../../sort/field/text()}"/>
- <input type="hidden" name="sort_order" value="{../../../../sort/field/order}"/>
- <input type="hidden" name="search_phrase" value="{../../../../filters/phrase}"/>
- <input type="hidden" name="min_cvss_base" value="{../../../../filters/min_cvss_base}"/>
- <input type="hidden" name="apply_min_cvss_base" value="{number (string-length (../../../../filters/min_cvss_base) > 0)}"/>
- <input type="hidden" name="notes" value="{../../../../filters/notes}"/>
- <input type="hidden" name="overrides" value="{../../../../filters/apply_overrides}"/>
- <input type="hidden" name="result_hosts_only={../../../../filters/result_hosts_only}"/>
<xsl:choose>
- <xsl:when test="$delta and $delta > 0">
+ <xsl:when test="$delta = 1">
+ <xsl:call-template name="note-detailed-delete-params">
+ <xsl:with-param name="base" select="../../../../."/>
+ </xsl:call-template>
<input type="hidden" name="delta_report_id" value="{../../../../delta/report/@id}"/>
<input type="hidden" name="delta_states" value="{../../../../filters/delta/text()}"/>
</xsl:when>
+ <xsl:when test="$delta = 2">
+ <xsl:call-template name="note-detailed-delete-params">
+ <xsl:with-param name="base" select="../../../../../."/>
+ </xsl:call-template>
+ <input type="hidden" name="delta_report_id" value="{../../../../../delta/report/@id}"/>
+ <input type="hidden" name="delta_states" value="{../../../../../filters/delta/text()}"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="note-detailed-delete-params">
+ <xsl:with-param name="base" select="../../../../."/>
+ </xsl:call-template>
+ </xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
@@ -11688,6 +11707,13 @@
<img src="/img/edit.png" border="0" alt="Edit"/>
</a>
</xsl:when>
+ <xsl:when test="$delta = 2">
+ <a href="/omp?cmd=edit_note&note_id={@id}&next=get_report&report_id={../../../../../@id}&first_result={../../../../../results/@start}&max_results={../../../../../results/@max}&sort_field={../../../../../sort/field/text()}&sort_order={../../../../../sort/field/order}&levels={../../../../../filters/text()}&notes={../../../../../filters/notes}&overrides={../../../../../filters/apply_overrides}&result_hosts_only={../../../../../filters/result_hosts_only}&search_phrase={../../../../../filters/phrase}&min_cvss_base={../../../../../filters/min_cvss_base}&apply_min_cvss_base={number (string-length (../../../../../filters/min_cvss_base) > 0)}&delta_report_id={../../../../../delta/report/@id}&delta_states={../../../../../filters/delta/text()}&token={/envelope/token}"
+ title="Edit Note"
+ style="margin-left:3px;">
+ <img src="/img/edit.png" border="0" alt="Edit"/>
+ </a>
+ </xsl:when>
<xsl:otherwise>
<a href="/omp?cmd=edit_note&note_id={@id}&next=get_report&report_id={../../../../@id}&first_result={../../../../results/@start}&max_results={../../../../results/@max}&sort_field={../../../../sort/field/text()}&sort_order={../../../../sort/field/order}&levels={../../../../filters/text()}&notes={../../../../filters/notes}&overrides={../../../../filters/apply_overrides}&result_hosts_only={../../../../filters/result_hosts_only}&search_phrase={../../../../filters/phrase}&min_cvss_base={../../../../filters/min_cvss_base}&apply_min_cvss_base={number (string-length (../../../../filters/min_cvss_base) > 0)}&delta_report_id={../../../../delta/report/@id}&delta_states={../../../../filters/delta/text()}&token={/envelope/token}"
title="Edit Note"
@@ -11709,6 +11735,22 @@
<!-- OVERRIDE -->
+<xsl:template name="override-detailed-delete-params">
+ <xsl:param name="base" select="."/>
+ <input type="hidden" name="report_id" value="{$base/@id}"/>
+ <input type="hidden" name="first_result" value="{$base/results/@start}"/>
+ <input type="hidden" name="max_results" value="{$base/results/@max}"/>
+ <input type="hidden" name="levels" value="{$base/filters/text()}"/>
+ <input type="hidden" name="sort_field" value="{$base/sort/field/text()}"/>
+ <input type="hidden" name="sort_order" value="{$base/sort/field/order}"/>
+ <input type="hidden" name="search_phrase" value="{$base/filters/phrase}"/>
+ <input type="hidden" name="min_cvss_base" value="{$base/filters/min_cvss_base}"/>
+ <input type="hidden" name="apply_min_cvss_base" value="{number (string-length ($base/filters/min_cvss_base) > 0)}"/>
+ <input type="hidden" name="notes" value="{$base/filters/notes}"/>
+ <input type="hidden" name="overrides" value="{$base/filters/apply_overrides}"/>
+ <input type="hidden" name="result_hosts_only={$base/filters/result_hosts_only}"/>
+</xsl:template>
+
<xsl:template name="override-detailed" match="override" mode="detailed">
<xsl:param name="override-buttons">1</xsl:param>
<xsl:param name="delta"/>
@@ -11773,23 +11815,26 @@
<input type="hidden" name="result_hosts_only={../../../../../../filters/result_hosts_only}"/>
</xsl:when>
<xsl:otherwise>
- <input type="hidden" name="report_id" value="{../../../../@id}"/>
- <input type="hidden" name="first_result" value="{../../../../results/@start}"/>
- <input type="hidden" name="max_results" value="{../../../../results/@max}"/>
- <input type="hidden" name="levels" value="{../../../../filters/text()}"/>
- <input type="hidden" name="sort_field" value="{../../../../sort/field/text()}"/>
- <input type="hidden" name="sort_order" value="{../../../../sort/field/order}"/>
- <input type="hidden" name="search_phrase" value="{../../../../filters/phrase}"/>
- <input type="hidden" name="min_cvss_base" value="{../../../../filters/min_cvss_base}"/>
- <input type="hidden" name="apply_min_cvss_base" value="{number (string-length (../../../../filters/min_cvss_base) > 0)}"/>
- <input type="hidden" name="notes" value="{../../../../filters/notes}"/>
- <input type="hidden" name="overrides" value="{../../../../filters/apply_overrides}"/>
- <input type="hidden" name="result_hosts_only={../../../../filters/result_hosts_only}"/>
<xsl:choose>
- <xsl:when test="$delta and $delta > 0">
+ <xsl:when test="$delta = 1">
+ <xsl:call-template name="override-detailed-delete-params">
+ <xsl:with-param name="base" select="../../../../."/>
+ </xsl:call-template>
<input type="hidden" name="delta_report_id" value="{../../../../delta/report/@id}"/>
<input type="hidden" name="delta_states" value="{../../../../filters/delta/text()}"/>
</xsl:when>
+ <xsl:when test="$delta = 2">
+ <xsl:call-template name="override-detailed-delete-params">
+ <xsl:with-param name="base" select="../../../../../."/>
+ </xsl:call-template>
+ <input type="hidden" name="delta_report_id" value="{../../../../../delta/report/@id}"/>
+ <input type="hidden" name="delta_states" value="{../../../../../filters/delta/text()}"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="override-detailed-delete-params">
+ <xsl:with-param name="base" select="../../../../."/>
+ </xsl:call-template>
+ </xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
@@ -11808,6 +11853,13 @@
<img src="/img/edit.png" border="0" alt="Edit"/>
</a>
</xsl:when>
+ <xsl:when test="$delta = 2">
+ <a href="/omp?cmd=edit_override&override_id={@id}&next=get_report&report_id={../../../../../@id}&first_result={../../../../../results/@start}&max_results={../../../../../results/@max}&sort_field={../../../../../sort/field/text()}&sort_order={../../../../../sort/field/order}&levels={../../../../../filters/text()}&notes={../../../../../filters/notes}&overrides={../../../../../filters/overrides}&result_hosts_only={../../../../../filters/result_hosts_only}&search_phrase={../../../../../filters/phrase}&min_cvss_base={../../../../../filters/min_cvss_base}&apply_min_cvss_base={number (string-length (../../../../../filters/min_cvss_base) > 0)}&delta_report_id={../../../../../delta/report/@id}&delta_states={../../../../../filters/delta/text()}&token={/envelope/token}"
+ title="Edit Override"
+ style="margin-left:3px;">
+ <img src="/img/edit.png" border="0" alt="Edit"/>
+ </a>
+ </xsl:when>
<xsl:otherwise>
<a href="/omp?cmd=edit_override&override_id={@id}&next=get_report&report_id={../../../../@id}&first_result={../../../../results/@start}&max_results={../../../../results/@max}&sort_field={../../../../sort/field/text()}&sort_order={../../../../sort/field/order}&levels={../../../../filters/text()}&notes={../../../../filters/notes}&overrides={../../../../filters/overrides}&result_hosts_only={../../../../filters/result_hosts_only}&search_phrase={../../../../filters/phrase}&min_cvss_base={../../../../filters/min_cvss_base}&apply_min_cvss_base={number (string-length (../../../../filters/min_cvss_base) > 0)}&delta_report_id={../../../../delta/report/@id}&delta_states={../../../../filters/delta/text()}&token={/envelope/token}"
title="Edit Override"
More information about the Openvas-commits
mailing list