From 7bd5e579ce637ffc62a7da64c907b587db859964 Mon Sep 17 00:00:00 2001 From: hengsin Date: Fri, 28 Apr 2023 18:26:47 +0800 Subject: [PATCH] IDEMPIERE-5689 Make MLocatorLookup and WLocatorEditor more extensible (#1800) * IDEMPIERE-5689 Add setValidationCode to MLocatorLookup * IDEMPIERE-5689 Make MLocatorLookup and WLocatorEditor more extensible --- .../src/org/compiere/model/MLocatorLookup.java | 9 +++++++++ .../org/adempiere/webui/editor/WLocatorEditor.java | 11 +++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java b/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java index 3fb2904c14..b054f7277d 100644 --- a/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java +++ b/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java @@ -542,4 +542,13 @@ public final class MLocatorLookup extends Lookup implements Serializable m_ctx = ctx; m_parsedValidation = null; } + + /** + * Set SQL validation code for lookup + * @param validationCode + */ + public void setValidationCode(String validationCode) + { + m_validationCode = validationCode; + } } // MLocatorLookup diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java index 4825ca35ac..74cf693165 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java @@ -467,7 +467,7 @@ public class WLocatorEditor extends WEditor implements EventListener, Pro * @return M_Warehouse_ID or 0 */ - private int getOnly_Warehouse_ID() + protected int getOnly_Warehouse_ID() { //IDEMPIERE-4882 : Load Locator To field value as per Warehouse TO field value String only_Warehouse=null; @@ -505,7 +505,7 @@ public class WLocatorEditor extends WEditor implements EventListener, Pro * @return M_Product_ID or 0 */ - private int getOnly_Product_ID() + protected int getOnly_Product_ID() { if (!Env.isSOTrx(Env.getCtx(), m_WindowNo)) return 0; // No product restrictions for PO @@ -602,4 +602,11 @@ public class WLocatorEditor extends WEditor implements EventListener, Pro super.dynamicDisplay(ctx); m_mLocator.dynamicDisplay(ctx); } + + /** + * @return {@link MLocatorLookup} + */ + public MLocatorLookup getMLocatorLookup() { + return m_mLocator; + } }