From 8fd5367c8f4f167fd99edaa2759d6342a96888c4 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 5 Mar 2009 08:42:55 +0000 Subject: [PATCH] OnFind doesn't check FindWindow.IsCancel --- .../webui/panel/AbstractADWindowPanel.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java index 7309d86578..ab99d0d33a 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java @@ -1044,20 +1044,21 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To curTab.getWhereExtended(), findFields, 1, curTab.getAD_Tab_ID()); find.setVisible(true); AEnv.showWindow(find); - MQuery query = find.getQuery(); - find = null; - - // Confirmed query - if (query != null) + if (!find.isCancel()) { - m_onlyCurrentRows = false; // search history too - curTab.setQuery(query); - curTabpanel.query(m_onlyCurrentRows, m_onlyCurrentDays, 0); // autoSize - } - - curTab.dataRefresh(); // Elaine 2008/07/25 - + MQuery query = find.getQuery(); + + // Confirmed query + if (query != null) + { + m_onlyCurrentRows = false; // search history too + curTab.setQuery(query); + curTabpanel.query(m_onlyCurrentRows, m_onlyCurrentDays, 0); // autoSize + } + + curTab.dataRefresh(); // Elaine 2008/07/25 + } } /**