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

[ 2165611 ] Zoom fields cannot be cleared

This commit is contained in:
Heng Sin Low 2008-10-15 04:50:08 +00:00
parent e4bee4874b
commit d0381a18c2
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zkwebui/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
View File

@ -430,13 +430,9 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
private void actionButton(String queryValue)
{
// m_button.setEnabled(false); // disable double click
if (lookup == null)
return; // leave button disabled
//m_text.requestFocus(); // closes other editors
/**
* Three return options:
* - Value Selected & OK pressed => store result => result has value
@ -444,8 +440,8 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
* - Window closed -> ignore => result == null && !cancalled
*/
Object result = null; // Not Being Used
boolean cancelled = false; // Not Being Used
Object result = null;
boolean cancelled = false;
String col = lookup.getColumnName(); // fully qualified name
@ -485,6 +481,9 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
ip.addValueChangeListener(this);
infoPanel = ip;
AEnv.showWindow(ip);
cancelled = ip.isCancelled();
result = ip.getSelectedKey();
}
else if (col.equals("C_BPartner_ID"))
{
@ -508,10 +507,8 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
infoPanel = ip;
AEnv.showWindow(ip);
/*
cancelled = ip.isCancelled();
result = ip.getSelectedKey();
*/
}
else // General Info
{
@ -544,20 +541,17 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
// Result
if (result != null)
{
// log.config(gridField.getColumnName() + " - Result = " + result.toString() + " (" + result.getClass().getName() + ")");
// make sure that value is in cache
lookup.getDirect(result, false, true);
//ensure data binding happen
actionCombo (result); // data binding
}
else if (cancelled)
{
log.config(getColumnName() + " - Result = null (cancelled)");
// actionCombo(null);
actionCombo(null);
}
else
{
log.config(getColumnName() + " - Result = null (not cancelled)");
// setValue(m_value); // to re-display value
}
}