[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvas-cvs
Subject:    [Openvas-commits] r22008 - in trunk/gsa: . src/html/classic
From:       scm-commit () wald ! intevation ! org
Date:       2015-03-31 19:00:47
Message-ID: 20150331190047.9CA9A9A123FC () wald ! intevation ! org
[Download RAW message or body]

Author: mattm
Date: 2015-03-31 21:00:47 +0200 (Tue, 31 Mar 2015)
New Revision: 22008

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/classic/omp.xsl
Log:
	* src/html/classic/omp.xsl (report [section-link]): Add missing host URL
	params to prognostic case.
	(report [section-filter]): Get prognostic params from ENVELOPE, where
	they are available.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2015-03-31 16:00:21 UTC (rev 22007)
+++ trunk/gsa/ChangeLog	2015-03-31 19:00:47 UTC (rev 22008)
@@ -1,5 +1,12 @@
 2015-03-31  Matthew Mundell <matthew.mundell@greenbone.net>
 
+	* src/html/classic/omp.xsl (report [section-link]): Add missing host URL
+	params to prognostic case.
+	(report [section-filter]): Get prognostic params from ENVELOPE, where
+	they are available.
+
+2015-03-31  Matthew Mundell <matthew.mundell@greenbone.net>
+
 	* src/html/classic/omp.xsl (html-create-user-form): Make LDAP line "odd"
 	because the previous is "even".
 

Modified: trunk/gsa/src/html/classic/omp.xsl
===================================================================
--- trunk/gsa/src/html/classic/omp.xsl	2015-03-31 16:00:21 UTC (rev 22007)
+++ trunk/gsa/src/html/classic/omp.xsl	2015-03-31 19:00:47 UTC (rev 22008)
@@ -27208,7 +27208,7 @@
   <xsl:variable name="link">
     <xsl:choose>
       <xsl:when test="$type = 'prognostic'">
-        <xsl:value-of \
select="concat('/omp?cmd=get_report_section&amp;report_section=', $section, \
'&amp;apply_filter=', $apply_filter, '&amp;type=prognostic&amp;host=', $host, \
'&amp;pos=', $pos, '&amp;filter=', $filter_term, '&amp;filt_id=', \
/envelope/params/filt_id, '&amp;token=', /envelope/token)"/> +        <xsl:value-of \
select="concat('/omp?cmd=get_report_section&amp;report_section=', $section, \
'&amp;apply_filter=', $apply_filter, '&amp;type=prognostic&amp;host=', $host, \
'&amp;pos=', $pos, '&amp;filter=', $filter_term, '&amp;filt_id=', \
/envelope/params/filt_id, '&amp;host_levels=', /envelope/params/host_levels, \
'&amp;host_search_phrase=', /envelope/params/host_search_phrase, \
'&amp;host_first_result=', /envelope/params/host_first_result, \
'&amp;host_max_results=', /envelope/params/host_max_results, '&amp;token=', \
/envelope/token)"/>  </xsl:when>
       <xsl:when test="$type = 'delta'">
         <xsl:variable name="delta" select="delta/report/@id"/>
@@ -27405,10 +27405,10 @@
             <xsl:if test="@type='prognostic'">
               <input type="hidden" name="type" value="prognostic"/>
               <input type="hidden" name="host" value="{filters/host}"/>
-              <input type="hidden" name="host_search_phrase" \
                value="{../host_search_phrase}"/>
-              <input type="hidden" name="host_levels" value="{../host_levels}"/>
-              <input type="hidden" name="host_first_result" \
                value="{../results/@start}"/>
-              <input type="hidden" name="host_max_results" \
value="{../results/@max}"/> +              <input type="hidden" \
name="host_search_phrase" value="{/envelope/params/host_search_phrase}"/> +           \
<input type="hidden" name="host_levels" value="{/envelope/params/host_levels}"/> +    \
<input type="hidden" name="host_first_result" \
value="{/envelope/params/host_first_result}"/> +              <input type="hidden" \
                name="host_max_results" value="{/envelope/params/host_max_results}"/>
               <input type="hidden" name="pos" value="{/envelope/params/pos}"/>
             </xsl:if>
             <xsl:if test="@type='delta'">
@@ -27438,10 +27438,10 @@
             <xsl:if test="@type='prognostic'">
               <input type="hidden" name="type" value="prognostic"/>
               <input type="hidden" name="host" value="{filters/host}"/>
-              <input type="hidden" name="host_search_phrase" \
                value="{../host_search_phrase}"/>
-              <input type="hidden" name="host_levels" value="{../host_levels}"/>
-              <input type="hidden" name="host_first_result" \
                value="{../results/@start}"/>
-              <input type="hidden" name="host_max_results" \
value="{../results/@max}"/> +              <input type="hidden" \
name="host_search_phrase" value="{/envelope/params/host_search_phrase}"/> +           \
<input type="hidden" name="host_levels" value="{/envelope/params/host_levels}"/> +    \
<input type="hidden" name="host_first_result" \
value="{/envelope/params/host_first_result}"/> +              <input type="hidden" \
                name="host_max_results" value="{/envelope/params/host_max_results}"/>
               <input type="hidden" name="pos" value="{/envelope/params/pos}"/>
             </xsl:if>
             <xsl:if test="@type='delta'">
@@ -27485,10 +27485,10 @@
       <xsl:if test="@type='prognostic'">
         <input type="hidden" name="type" value="prognostic"/>
         <input type="hidden" name="host" value="{filters/host}"/>
-        <input type="hidden" name="host_search_phrase" \
                value="{../host_search_phrase}"/>
-        <input type="hidden" name="host_levels" value="{../host_levels}"/>
-        <input type="hidden" name="host_first_result" value="{../results/@start}"/>
-        <input type="hidden" name="host_max_results" value="{../results/@max}"/>
+        <input type="hidden" name="host_search_phrase" \
value="{/envelope/params/host_search_phrase}"/> +        <input type="hidden" \
name="host_levels" value="{/envelope/params/host_levels}"/> +        <input \
type="hidden" name="host_first_result" value="{/envelope/params/host_first_result}"/> \
+        <input type="hidden" name="host_max_results" \
value="{/envelope/params/host_max_results}"/>  <input type="hidden" name="pos" \
value="{/envelope/params/pos}"/>  </xsl:if>
       <xsl:if test="@type='delta'">

_______________________________________________
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]