From 37cd70900d61d8d915aafc97525791d5fe4d8e2a Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Wed, 22 Oct 2014 10:17:38 -0500 Subject: [PATCH] IDEMPIERE-2122 ShowAdress link only appears on some columns --- .../org/adempiere/webui/editor/WTableDirEditor.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java index 4ff9f46be7..364f6ea6d0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java @@ -176,10 +176,10 @@ ContextMenuListener, IZoomableEditor if (gridField != null) { - String columnName = getColumnName(); - if ((columnName.toUpperCase().equals("C_BPARTNER_LOCATION_ID")) - || (columnName.toUpperCase().equals("BILL_LOCATION_ID")) - || (columnName.toUpperCase().equals("DROPSHIP_LOCATION_ID"))) + String tableName_temp = lookup.getColumnName(); // Returns AD_Org.AD_Org_ID + int posPoint = tableName_temp.indexOf("."); + String tableName = tableName_temp.substring(0, posPoint); + if (tableName.toUpperCase().equals("C_BPARTNER_LOCATION")) { popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), false, false, true, lookup); } else { @@ -191,9 +191,6 @@ ContextMenuListener, IZoomableEditor boolean isShortListAvailable = false; // Short List available for this lookup if (lookup != null && (lookup.getDisplayType() == DisplayType.TableDir || lookup.getDisplayType() == DisplayType.Table)) // only for Table & TableDir { - String tableName_temp = lookup.getColumnName(); // Returns AD_Org.AD_Org_ID - int posPoint = tableName_temp.indexOf("."); - String tableName = tableName_temp.substring(0, posPoint); MTable table = MTable.get(Env.getCtx(), tableName); isShortListAvailable = (table.getColumnIndex("IsShortList") >= 0); if (isShortListAvailable)