From 106cbc7e149281a8b03ac45d82ca5692cc4ff6d5 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 13 Mar 2023 12:44:51 +0100 Subject: [PATCH] IDEMPIERE-5629 Error when using context variables in info window view ID column (#1725) --- .../WEB-INF/src/org/adempiere/webui/info/InfoWindow.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 859eb2fd30..514ccb5fd9 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 @@ -1398,6 +1398,10 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL protected void prepareTable(ColumnInfo[] layout, String from, String where, String orderBy) { super.prepareTable(layout, from, where, orderBy); + + addViewIDToQuery(); + addKeyViewToQuery(); + if (m_sqlMain.indexOf("@") >= 0) { String sql = Env.parseContext(infoContext, p_WindowNo, m_sqlMain, true); if (sql == null || sql.length() == 0) { @@ -1406,10 +1410,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL m_sqlMain = sql; } } - - addViewIDToQuery(); - addKeyViewToQuery(); - + if (m_sqlMain.length() > 0 && infoWindow.isDistinct()) { m_sqlMain = m_sqlMain.substring("SELECT ".length()); m_sqlMain = "SELECT DISTINCT " + m_sqlMain;