From 39ba0fba8f8de6ade957e7c0c7f91e600e29add6 Mon Sep 17 00:00:00 2001 From: hieplq Date: Wed, 20 Jan 2016 22:07:11 +0700 Subject: [PATCH] IDEMPIERE-3003:Info Window - Reset button should reset grid content --- .../WEB-INF/src/org/adempiere/webui/info/InfoWindow.java | 2 ++ .../WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 1994010c23..164d519e5f 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 @@ -1646,6 +1646,8 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL // filter dynamic value dynamicDisplay(null); + + onQueryCallback (null); } @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 e4bcb447f5..eb5fea8e16 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 @@ -1984,7 +1984,12 @@ public abstract class InfoPanel extends Window implements EventListener, } } m_sqlUserOrder=""; - executeQuery(); + // event == null mean direct call from reset button + if (event == null) + m_count = 0; + else + executeQuery(); + renderItems(); // IDEMPIERE-1334 after refresh, restore prev selected item start // just evaluate display logic of process button when requery by use click requery button