Update of /cvsroot/displaytag/displaytag/src/org/apache/taglibs/display
In directory sc8-pr-cvs1:/tmp/cvs-serv28488
Modified Files:
TableTag.java
Log Message:
fixes the paging through sorted columns bug
Index: TableTag.java
===================================================================
RCS file: /cvsroot/displaytag/displaytag/src/org/apache/taglibs/display/TableTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TableTag.java 12 Jun 2003 18:37:26 -0000 1.12
--- TableTag.java 15 Jul 2003 20:05:50 -0000 1.13
***************
*** 737,741 ****
HttpServletRequest req = (HttpServletRequest)
this.pageContext.getRequest();
if (req.getParameter("sort") != null) {
! if (!prop.getProperty("sort.behavior").equalsIgnoreCase("page")) {
this.pageNumber = 1;
}
--- 737,741 ----
HttpServletRequest req = (HttpServletRequest)
this.pageContext.getRequest();
if (req.getParameter("sort") != null) {
! if (!prop.getProperty("sort.behavior").equalsIgnoreCase("page") &&
req.getParameter("page") == null) {
this.pageNumber = 1;
}
***************
*** 1349,1366 ****
HttpServletRequest req = (HttpServletRequest) this.pageContext.getRequest();
! String url = this.requestURI;
! if (url == null) {
! url = req.getRequestURI();
! }
! // url += req.getQueryString();
! // flag to determine if we should use a ? or a &
! int index = url.indexOf('?');
! String separator = "";
! if (index == -1) {
! separator = "?";
}
! else {
! separator = "&";
}
--- 1349,1363 ----
HttpServletRequest req = (HttpServletRequest) this.pageContext.getRequest();
! String url = this.requestURI == null ?
! req.getRequestURI() : this.requestURI;
! String separator = url.indexOf('?') == -1 ? "?" : "&";
!
! StringBuffer pagingUrl = new StringBuffer(url).append(separator);
! if(this.sortColumn > -1) {
! pagingUrl.append("sort=").append(this.sortColumn).append("&");
}
! if(req.getParameter("order")!=null) {
! pagingUrl.append("order=").append((this.sortOrder ==
TableTag.SORT_ORDER_ASCEENDING ?"asc":"dec")).append("&");
}
***************
*** 1385,1389 ****
buf.append("<td valign=\"bottom\" align=\"right\" class=\"");
buf.append("tableCellAction\">\n");
! buf.append(helper.getPageNavigationBar(url + separator +
"page={0,number,#}"));
buf.append("</td>\n</tr></table></td></tr>\n");
}
--- 1382,1386 ----
buf.append("<td valign=\"bottom\" align=\"right\" class=\"");
buf.append("tableCellAction\">\n");
!
buf.append(helper.getPageNavigationBar(pagingUrl.append("&page={0,number,#}").toString()));
buf.append("</td>\n</tr></table></td></tr>\n");
}
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
displaytag-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/displaytag-devel
