From 407b756cb86461b0b05fa6b762d57fe8a443a19b Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Sun, 16 Jul 2023 22:02:44 +0800
Subject: [PATCH] IDEMPIERE-5800 Info Window Context Variables are not Cleared
 after Closing (#1937)

---
 .../src/org/compiere/util/CLogMgt.java           |  4 ++--
 .../org/adempiere/webui/grid/WQuickEntry.java    |  3 ++-
 .../src/org/adempiere/webui/info/InfoWindow.java | 16 +++++++++++++---
 .../src/org/adempiere/webui/panel/InfoPanel.java |  5 +++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/util/CLogMgt.java b/org.adempiere.base/src/org/compiere/util/CLogMgt.java
index 26f349a4fd..f0c4baa022 100644
--- a/org.adempiere.base/src/org/compiere/util/CLogMgt.java
+++ b/org.adempiere.base/src/org/compiere/util/CLogMgt.java
@@ -641,9 +641,9 @@ public class CLogMgt
 			.append(cc.getDatabase().getStatus().replace(" , ", NL)).append(NL);
 		
 		//  Context
-		sb.append(NL)
-			.append("=== Context ===").append(NL);
 		String[] context = Env.getEntireContext(ctx);
+		sb.append(NL)
+			.append("=== Context (%s) ===".formatted(context.length)).append(NL);		
 		Arrays.sort(context);
 		for (int i = 0; i < context.length; i++)
 			sb.append(context[i]).append(NL);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
index c7d675a0e1..21abcd6884 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
@@ -132,7 +132,8 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		Env.setContext(Env.getCtx(), m_WindowNo, QUICK_ENTRY_CALLER_WINDOW, parent_WindowNo);
 		Env.setContext(Env.getCtx(), m_WindowNo, QUICK_ENTRY_CALLER_TAB, parent_TabNo);
 		initPOs();
-		log.info("R/O=" + isReadOnly());
+		if (log.isLoggable(Level.INFO))
+			log.info("R/O=" + isReadOnly());
 
 	}	//	WQuickEntry
 	
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 87eade9672..b32f858e98 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
@@ -2686,10 +2686,20 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		
 		boolean hasNew = getADWindowID () > 0;
 		if (hasNew && vqe == null && hasRightQuickEntry){
-			GridWindow gridwindow = GridWindow.get(Env.getCtx(), 0, getADWindowID());
+			GridWindow gridwindow = GridWindow.get(Env.getCtx(), -1, getADWindowID());
 			hasRightQuickEntry = gridwindow != null;
-			if (hasRightQuickEntry)
-				vqe = Extensions.getQuickEntry(0, 0, getADWindowID());
+			if (hasRightQuickEntry) {
+				vqe = Extensions.getQuickEntry(p_WindowNo, 0, getADWindowID());
+				if (vqe != null) {
+					int windowNo = SessionManager.getAppDesktop().findWindowNo(vqe);
+					if (windowNo > 0 && windowNo != p_WindowNo) {
+						SessionManager.getAppDesktop().unregisterWindow(windowNo);
+					}
+				}
+			}
+			//clear gridWindow context
+			if (gridwindow != null)
+				Env.clearWinContext(-1);
 		}
 			
 		return hasNew && vqe != null && vqe.isAvailableQuickEdit();
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 f9d3c8231f..c3e23af21b 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
@@ -232,6 +232,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 
 	private Button btnSelectAll;
 	private Button btnDeSelectAll;
+
+	private boolean registerWindowNo = false;
 	
 	/**************************************************
      *  Detail Constructor
@@ -295,6 +297,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	{				
 		if (WindowNo <= 0) {
 			p_WindowNo = SessionManager.getAppDesktop().registerWindow(this);
+			registerWindowNo  = true;
 		} else {
 			p_WindowNo = WindowNo;
 		}
@@ -3237,6 +3240,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 				SessionManager.getSessionApplication().getKeylistener().removeEventListener(Events.ON_CTRL_KEY, this);
 			if (getFirstChild() != null)
 				saveWlistBoxColumnWidth(getFirstChild());
+			if (registerWindowNo && SessionManager.getAppDesktop() != null)
+				SessionManager.getAppDesktop().unregisterWindow(p_WindowNo);
 		} catch (Exception e){
 			log.log(Level.WARNING, e.getMessage(), e);
 		}