midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed paging error.

This commit is contained in:
Heng Sin Low 2010-07-19 14:04:54 +08:00
parent 35c3fd21e6
commit 31fcf0b7bd
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
View File

@ -58,6 +58,8 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients; import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.ListModelExt; import org.zkoss.zul.ListModelExt;
import org.zkoss.zul.Listhead;
import org.zkoss.zul.Listheader;
import org.zkoss.zul.Listitem; import org.zkoss.zul.Listitem;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
import org.zkoss.zul.event.ZulEvents; import org.zkoss.zul.event.ZulEvents;
@ -546,9 +548,20 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
//cacheStart & cacheEnd - 1 based index, start & end - 0 based index //cacheStart & cacheEnd - 1 based index, start & end - 0 based index
if (cacheStart >= 1 && cacheEnd > cacheStart) if (cacheStart >= 1 && cacheEnd > cacheStart)
{ {
if (start+1 >= cacheStart && end+1 <= cacheEnd) if (m_useDatabasePaging)
{ {
return end == -1 ? line : line.subList(start-cacheStart+1, end-cacheStart+2); if (start+1 >= cacheStart && end+1 <= cacheEnd)
{
return end == -1 ? line : line.subList(start-cacheStart+1, end-cacheStart+2);
}
}
else
{
if (end >= cacheEnd || end <= 0)
{
end = cacheEnd-1;
}
return line.subList(start, end+1);
} }
} }
@ -632,7 +645,11 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
DB.close(m_rs, m_pstmt); DB.close(m_rs, m_pstmt);
} }
return line; if (end >= cacheEnd || end <= 0)
{
end = cacheEnd-1;
}
return line.subList(start, end+1);
} }
private void addDoubleClickListener() { private void addDoubleClickListener() {
@ -1076,6 +1093,8 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
pageNo = pgNo; pageNo = pgNo;
int start = pageNo * PAGE_SIZE; int start = pageNo * PAGE_SIZE;
int end = start + PAGE_SIZE; int end = start + PAGE_SIZE;
if (end >= m_count)
end = m_count - 1;
List<Object> subList = readLine(start, end); List<Object> subList = readLine(start, end);
model = new ListModelTable(subList); model = new ListModelTable(subList);
model.setSorter(this); model.setSorter(this);
@ -1109,6 +1128,15 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
{ {
try try
{ {
Listhead listHead = contentPanel.getListHead();
if (listHead != null) {
List<?> headers = listHead.getChildren();
for(Object obj : headers)
{
Listheader header = (Listheader) obj;
header.setSortDirection("natural");
}
}
executeQuery(); executeQuery();
renderItems(); renderItems();
} }