svn commit: r891116 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp

[brett]

Author: brett
Date: Wed Dec 16 04:03:43 2009
New Revision: 891116

URL: http://svn.apache.org/viewvc?rev=891116&view=rev
Log:
[MRM-1301] fix the statistics report page

Modified:
    
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp

Modified: 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
URL: 
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp?rev=891116&r1=891115&r2=891116&view=diff
==============================================================================
--- 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
 (original)
+++ 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
 Wed Dec 16 04:03:43 2009
@@ -48,28 +48,28 @@
        <strong>${report.version}</strong>
        </p>
     
-               <blockquote>${report.message}</blockquote>
+               <blockquote><c:out value="${report.message}" /></blockquote>
        </c:forEach>
   </c:forEach>
 
   <c:set var="prevPageUrl">
-    <s:url action="generateReport" namespace="/">
-      <s:param name="groupId" />
-      <s:param name="repositoryId" />
-      <s:param name="rowCount" />
+    <s:url action="generateReport" namespace="/report">
+      <s:param name="groupId" value="%{#attr.groupId}" />
+      <s:param name="repositoryId" value="%{#attr.repositoryId }" />
+      <s:param name="rowCount" value="%{#attr.rowCount}" />
       <s:param name="page" value="%{#attr.page - 1}"/>
     </s:url>
   </c:set>
   <c:set var="nextPageUrl">
-    <s:url action="generateReport" namespace="/">
-      <s:param name="groupId" />
-      <s:param name="repositoryId" />
-      <s:param name="rowCount" />
+    <s:url action="generateReport" namespace="/report">
+      <s:param name="groupId" value="%{#attr.groupId}" />
+      <s:param name="repositoryId" value="%{#attr.repositoryId }" />
+      <s:param name="rowCount" value="%{#attr.rowCount}" />
       <s:param name="page" value="%{#attr.page + 1}"/>
     </s:url>
   </c:set>
-  <s:set name="page" value="page"/>
-  <c:if test="${page > 1}"><a href="${prevPageUrl}">&lt;&lt;</a></c:if>
+  <s:set name="page" value="page" />
+  <c:if test="${page gt 1}"><a href="${prevPageUrl}">&lt;&lt;</a></c:if>
   Page: ${page}
   <s:set name="lastPage" value="lastPage"/>
   <c:if test="${!lastPage}"><a href="${nextPageUrl}">&gt;&gt;</a></c:if>