midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-979:WSearchEditor used in forms don't have popup menu 

menu for wtableDirEditor in case hasn't gfield
This commit is contained in:
hieplq 2015-08-13 03:55:41 +08:00
parent d6da6ee556
commit dcaddc41b6
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
View File

@ -211,11 +211,13 @@ public class WAllocation extends Allocation
row.appendCellChild(organizationLabel.rightAlign()); row.appendCellChild(organizationLabel.rightAlign());
organizationPick.getComponent().setHflex("true"); organizationPick.getComponent().setHflex("true");
row.appendCellChild(organizationPick.getComponent(),1); row.appendCellChild(organizationPick.getComponent(),1);
organizationPick.showMenu();
row = rows.newRow(); row = rows.newRow();
row.appendCellChild(currencyLabel.rightAlign(),1); row.appendCellChild(currencyLabel.rightAlign(),1);
currencyPick.getComponent().setHflex("true"); currencyPick.getComponent().setHflex("true");
row.appendCellChild(currencyPick.getComponent(),1); row.appendCellChild(currencyPick.getComponent(),1);
currencyPick.showMenu();
row.appendCellChild(multiCurrency,1); row.appendCellChild(multiCurrency,1);
row.appendCellChild(autoWriteOff,2); row.appendCellChild(autoWriteOff,2);
row.appendCellChild(new Space(),1); row.appendCellChild(new Space(),1);

25
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
View File

@ -174,19 +174,20 @@ ContextMenuListener, IZoomableEditor
refreshList(); refreshList();
} }
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 {
popupMenu = new WEditorPopupMenu(zoom, true, isShowPreference(), false, false, false, lookup);
}
addChangeLogMenu(popupMenu);
if (gridField != null) if (gridField != null)
{ {
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 {
popupMenu = new WEditorPopupMenu(zoom, true, isShowPreference(), false, false, false, lookup);
}
addChangeLogMenu(popupMenu);
// IDEMPIERE 90 // IDEMPIERE 90
boolean isShortListAvailable = false; // Short List available for this lookup boolean isShortListAvailable = false; // Short List available for this lookup
if (lookup != null && (lookup.getDisplayType() == DisplayType.TableDir || lookup.getDisplayType() == DisplayType.Table)) // only for Table & TableDir if (lookup != null && (lookup.getDisplayType() == DisplayType.TableDir || lookup.getDisplayType() == DisplayType.Table)) // only for Table & TableDir
@ -199,7 +200,7 @@ ContextMenuListener, IZoomableEditor
lookup.setShortList(true); lookup.setShortList(true);
getLabel().setText(">" + getGridField().getHeader() + "<"); getLabel().setText(">" + getGridField().getHeader() + "<");
actionRefresh(); actionRefresh();
// add in popup menu // add in popup menu
Menuitem searchMode; Menuitem searchMode;
searchMode = new Menuitem(); searchMode = new Menuitem();