[prev in list] [next in list] [prev in thread] [next in thread]
List: openvas-cvs
Subject: [Openvas-commits] r21713 - in trunk/gsa: . src/html/classic
From: scm-commit () wald ! intevation ! org
Date: 2015-02-25 13:26:27
Message-ID: 20150225132627.9A7DD9A213BD () wald ! intevation ! org
[Download RAW message or body]
Author: mattm
Date: 2015-02-25 14:26:27 +0100 (Wed, 25 Feb 2015)
New Revision: 21713
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/classic/omp.xsl
Log:
More conversion from GET_NVTS to GET_INFO.
* src/html/classic/omp.xsl (get_nvts): Use get_info instead of get_nvts
as the next page for the new note and override icons, and the icons in
the user tags window
(html-create-note-form, html-create-override-form): Add params for
get_info case.
(html-edit-note-form, html-edit-override-form): Remove get_nvts param.
It's no longer possible to edit these from the NVT Details page.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2015-02-25 11:11:56 UTC (rev 21712)
+++ trunk/gsa/ChangeLog 2015-02-25 13:26:27 UTC (rev 21713)
@@ -1,3 +1,15 @@
+2015-02-25 Matthew Mundell <matthew.mundell@greenbone.net>
+
+ More conversion from GET_NVTS to GET_INFO.
+
+ * src/html/classic/omp.xsl (get_nvts): Use get_info instead of get_nvts
+ as the next page for the new note and override icons, and the icons in
+ the user tags window
+ (html-create-note-form, html-create-override-form): Add params for
+ get_info case.
+ (html-edit-note-form, html-edit-override-form): Remove get_nvts param.
+ It's no longer possible to edit these from the NVT Details page.
+
2015-02-24 Matthew Mundell <matthew.mundell@greenbone.net>
* src/html/classic/omp.xsl (tagged_resource_link, cve-details)
Modified: trunk/gsa/src/html/classic/omp.xsl
===================================================================
--- trunk/gsa/src/html/classic/omp.xsl 2015-02-25 11:11:56 UTC (rev 21712)
+++ trunk/gsa/src/html/classic/omp.xsl 2015-02-25 13:26:27 UTC (rev 21713)
@@ -19358,11 +19358,11 @@
<img src="/img/list.png" border="0" alt="{gsa:i18n ('NVTs', 'NVT')}"/>
</a>
<div id="small_inline_form" style="display: inline; margin-left: 15px; \
font-weight: normal;">
- <a href="/omp?cmd=new_note&next=get_nvts&resource_id={$nvts_response/nvt/@oid}&oid={$nvts_response/nvt/@oid}&filter={str:encode-uri \
(/envelope/params/filter, true \
())}&filt_id={/envelope/params/filt_id}&token={/envelope/token}" + \
<a href="/omp?cmd=new_note&next=get_info&info_type=nvt&info_id={$nvts_response/nvt/@oid}&oid={$nvts_response/nvt/@oid}&filter={str:encode-uri \
(/envelope/params/filter, true \
())}&filt_id={/envelope/params/filt_id}&token={/envelope/token}"
title="{gsa:i18n ('Add Note', 'Note')}" style="margin-left:3px;">
<img src="/img/new_note.png" border="0" alt="{gsa:i18n ('Add Note', \
'Note')}"/> </a>
- <a href="/omp?cmd=new_override&next=get_nvts&resource_id={$nvts_response/nvt/@oid}&oid={$nvts_response/nvt/@oid}&filter={str:encode-uri \
(/envelope/params/filter, true \
())}&filt_id={/envelope/params/filt_id}&token={/envelope/token}" + \
<a href="/omp?cmd=new_override&next=get_info&info_type=nvt&info_id={$nvts_response/nvt/@oid}&oid={$nvts_response/nvt/@oid}&filter={str:encode-uri \
(/envelope/params/filter, true \
())}&filt_id={/envelope/params/filt_id}&token={/envelope/token}"
title="{gsa:i18n ('Add Override', 'Override')}" \
style="margin-left:3px;">
<img src="/img/new_override.png" border="0" alt="{gsa:i18n ('Add \
Override', 'Override')}"/> </a>
@@ -19378,9 +19378,9 @@
<xsl:with-param name="title" select="concat(gsa:i18n ('User Tags for', 'Tag \
Window'),' "',$nvts_response/nvt/name,'":')"/>
<xsl:with-param name="user_tags" select="$nvts_response/nvt/user_tags"/>
<xsl:with-param name="tag_names" select="get_tags_response"/>
- <xsl:with-param name="resource_type" select="'nvt'"/>
- <xsl:with-param name="next" select="'get_nvts'"/>
+ <xsl:with-param name="resource_type" select="'info'"/>
<xsl:with-param name="resource_id" select="$nvts_response/nvt/@oid"/>
+ <xsl:with-param name="resource_subtype" select="'nvt'"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
@@ -19429,6 +19429,11 @@
<input type="hidden" name="report_id" value="{report/@id}"/>
<input type="hidden" name="overrides" value="{overrides}"/>
</xsl:when>
+ <xsl:when test="/envelope/params/next='get_info'">
+ <!-- get_info (nvt) params. -->
+ <input type="hidden" name="info_id" value="{/envelope/params/oid}"/>
+ <input type="hidden" name="info_type" value="nvt"/>
+ </xsl:when>
<xsl:otherwise>
<!-- get_report params. -->
<input type="hidden" name="report_id" \
value="{/envelope/params/report_id}"/> @@ -19746,9 +19751,6 @@
<input type="hidden" name="overrides" value="{/envelope/params/overrides}"/>
<input type="hidden" name="details" value="{/envelope/params/details}"/>
- <!-- get_nvts param. -->
- <input type="hidden" name="oid" value="{/envelope/params/oid}"/>
-
<!-- get_tasks param. -->
<input type="hidden" name="task_id" value="{/envelope/params/task_id}"/>
@@ -20466,6 +20468,11 @@
<input type="hidden" name="report_id" value="{report/@id}"/>
<input type="hidden" name="overrides" value="{overrides}"/>
</xsl:when>
+ <xsl:when test="/envelope/params/next='get_info'">
+ <!-- get_info (nvt) params. -->
+ <input type="hidden" name="info_id" value="{/envelope/params/oid}"/>
+ <input type="hidden" name="info_type" value="nvt"/>
+ </xsl:when>
<xsl:otherwise>
<!-- get_report params. -->
<input type="hidden" name="report_id" \
value="{/envelope/params/report_id}"/> @@ -20803,9 +20810,6 @@
<input type="hidden" name="overrides" value="{/envelope/params/overrides}"/>
<input type="hidden" name="details" value="{/envelope/params/details}"/>
- <!-- get_nvts param. -->
- <input type="hidden" name="oid" value="{/envelope/params/oid}"/>
-
<!-- get_tasks param. -->
<input type="hidden" name="task_id" value="{/envelope/params/task_id}"/>
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic