]> source.dussan.org Git - archiva.git/commitdiff
[MRM-933]
authorMaria Odea B. Ching <oching@apache.org>
Wed, 4 Feb 2009 02:32:30 +0000 (02:32 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Wed, 4 Feb 2009 02:32:30 +0000 (02:32 +0000)
applied some parts of the patch submitted by Gwen Harold Autencio
- fix results.jsp

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@740580 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp

index 971f0025279673b8116f8c8c63eea161b6a0db5d..0ee7600129e7d8be86cfe60df975e0683780692c 100644 (file)
         <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>