Author: oching
Date: Wed Feb 4 02:32:30 2009
New Revision: 740580
URL: http://svn.apache.org/viewvc?rev=740580&view=rev
Log:
[MRM-933]
applied some parts of the patch submitted by Gwen Harold Autencio
- fix results.jsp
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=740580&r1=740579&r2=740580&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
Wed Feb 4 02:32:30 2009
@@ -94,7 +94,14 @@
<c:set var="hitsNum">${fn:length(results.hits) + (currentPage *
results.limits.pageSize)}</c:set>
<c:choose>
<c:when test="${results.totalHits > results.limits.pageSize}">
- <p>Hits: ${(hitsNum - results.limits.pageSize) + 1} to
${hitsNum} of ${results.totalHits}</p>
+ <c:choose>
+ <c:when test="${fn:length(results.hits) < rowCount}">
+ <p>Hist: ${(rowCount * currentPage) + 1} to ${hitsNum} of
${results.totalHits}</p>
+ </c:when>
+ <c:otherwise>
+ <p>Hits: ${(hitsNum - results.limits.pageSize) + 1} to
${hitsNum} of ${results.totalHits}</p>
+ </c:otherwise>
+ </c:choose>
</c:when>
<c:otherwise>
<p>Hits: 1 to ${hitsNum} of ${results.totalHits}</p>
