Author: oching
Date: Thu Sep 4 01:08:39 2008
New Revision: 691911
URL: http://svn.apache.org/viewvc?rev=691911&view=rev
Log:
merge -r691892 (fix NPE when clicking next & previous icon of bytecode search
results) from 1.1.x branch
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=691911&r1=691910&r2=691911&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Thu Sep 4 01:08:39 2008
@@ -69,13 +69,17 @@
<%-- Prev & Next icons --%>
<c:set var="prevPageUrl">
<ww:url action="quickSearch" namespace="/">
- <ww:param name="q" value="%{'${q}'}"/>
+ <ww:param name="q" value="%{'${q}'}"/>
+ <ww:param name="searchResultsOnly"
value="%{'${searchResultsOnly}'}"/>
+ <ww:param name="completeQueryString"
value="%{'${completeQueryString}'}"/>
<ww:param name="currentPage" value="%{'${currentPage - 1}'}"/>
</ww:url>
</c:set>
<c:set var="nextPageUrl">
<ww:url action="quickSearch" namespace="/">
<ww:param name="q" value="%{'${q}'}"/>
+ <ww:param name="searchResultsOnly"
value="%{'${searchResultsOnly}'}"/>
+ <ww:param name="completeQueryString"
value="%{'${completeQueryString}'}"/>
<ww:param name="currentPage" value="%{'${currentPage + 1}'}"/>
</ww:url>
</c:set>