From da2f37fbe07a0bc08aa361e5450123cbcf4538dc Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 14 May 2015 19:10:22 +0700 Subject: [PATCH] IDEMPIERE-2616:Bug after closing Search Dialog --- .../WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 9bea87bc00..200d07da46 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 @@ -206,7 +206,8 @@ public abstract class InfoPanel extends Window implements EventListener, infoWindow = MInfoWindow.get(p_keyColumn.replace("_ID", ""), null); addEventListener(WindowContainer.ON_WINDOW_CONTAINER_SELECTION_CHANGED_EVENT, this); addEventListener(ON_RUN_PROCESS, this); - + addEventListener(Events.ON_CLOSE, this); + } // InfoPanel private void init() @@ -1375,7 +1376,7 @@ public abstract class InfoPanel extends Window implements EventListener, // do nothing when parameter not change and at window mode, or at dialog mode but select non record onOk(); } - }else if (event.getName().equals(Events.ON_CANCEL)){ + }else if (event.getName().equals(Events.ON_CANCEL) || (event.getTarget().equals(this) && event.getName().equals(Events.ON_CLOSE))){ m_cancel = true; dispose(false); }