diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index 164d519e5f..48b41c7e51 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -1648,6 +1648,11 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL dynamicDisplay(null); onQueryCallback (null); + + if (paging != null) + paging.setParent(null); + + layout.invalidate(); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index 6e600aa518..1c6f9932aa 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -733,7 +733,6 @@ public abstract class InfoPanel extends Window implements EventListener, paging.setTotalSize(m_count); paging.setDetailed(true); paging.addEventListener(ZulEvents.ON_PAGING, this); - insertPagingComponent(); } else { @@ -782,6 +781,9 @@ public abstract class InfoPanel extends Window implements EventListener, updateStatusBar (m_count); setStatusSelected (); addDoubleClickListener(); + + if (paging != null && paging.getParent() == null) + insertPagingComponent(); } protected void updateStatusBar (int no){