#633-webui bug-repair

#633
metasfresh · Oct 24, 2017 · 1747d05 · 1747d05
1 parent e09be98
commit 1747d05
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...web/window/descriptor/factory/standard/GridTabVOBasedDocumentEntityDescriptorFactory.java b/...web/window/descriptor/factory/standard/GridTabVOBasedDocumentEntityDescriptorFactory.java
@@ -9,6 +9,7 @@
 import org.adempiere.ad.expression.api.ConstantLogicExpression;
 import org.adempiere.ad.expression.api.IExpression;
 import org.adempiere.ad.expression.api.ILogicExpression;
+import org.adempiere.ad.table.api.IADTableDAO;
 import org.adempiere.model.InterfaceWrapperHelper;
 import org.adempiere.util.Check;
 import org.adempiere.util.Services;
@@ -274,10 +275,13 @@ private final void createAndAddDocumentField(final DocumentEntityDescriptor.Buil
 			widgetType = DescriptorsFactoryHelper.extractWidgetType(sqlColumnName, displayType);
 
 			alwaysUpdateable = extractAlwaysUpdateable(gridFieldVO);
+
+			final String ctxTableName = Services.get(IADTableDAO.class).retrieveTableName(gridFieldVO.getAD_Table_ID());
 
 			lookupDescriptorProvider = SqlLookupDescriptor.builder()
-					.setCtxTableName(null)
+					.setCtxTableName(ctxTableName)
 					.setCtxColumnName(sqlColumnName)
+
 					.setWidgetType(widgetType)
 					.setDisplayType(displayType)
 					.setAD_Reference_Value_ID(gridFieldVO.getAD_Reference_Value_ID())

diff --git a/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java b/src/main/java/de/metas/ui/web/window/descriptor/sql/SqlLookupDescriptor.java
@@ -330,7 +330,7 @@ private static LookupDescriptorProvider buildProvider(
 					|| DisplayType.Button == displayType && AD_Reference_Value_ID > 0)
 			{
 				return LookupDescriptorProvider.fromMemoizingFunction(scope -> SqlLookupDescriptor.builder()
-						.setCtxTableName(null)
+						.setCtxTableName(sqlTableName)
 						.setCtxColumnName(sqlColumnName)
 						.setDisplayType(displayType)
 						.setAD_Reference_Value_ID(AD_Reference_Value_ID)