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

IDEMPIERE-1777:improvement behavior of WSearchEditor

This commit is contained in:
hieplq 2014-03-22 14:44:54 +07:00
parent 0cb4c95f98
commit 436dd2236e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
View File

@ -233,6 +233,12 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
infoPanel.detach(); infoPanel.detach();
infoPanel = null; infoPanel = null;
} }
// hsv: fix to when switch has text => emtpy text, don't show info panel
if ("".equals(getComponent().getText().trim())){
actionCombo(null);
resetButtonState();
return;
}
actionText(getComponent().getText()); actionText(getComponent().getText());
} }
else if ((Events.ON_OK.equals(e.getName()))) { else if ((Events.ON_OK.equals(e.getName()))) {
@ -264,14 +270,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
{ {
if ("FieldValue".equals(evt.getPropertyName())) if ("FieldValue".equals(evt.getPropertyName()))
{ {
if ( evt.getNewValue()== null) actionRefresh(evt.getNewValue());
{
actionRefresh("");
}
else
{
actionRefresh(evt.getNewValue());
}
} }
} }
@ -578,12 +577,14 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
if (log.isLoggable(Level.CONFIG)) log.config(getColumnName() + " - Result = null (cancelled)"); if (log.isLoggable(Level.CONFIG)) log.config(getColumnName() + " - Result = null (cancelled)");
if (value != null) if (value != null)
{ {
if (lookup.getDisplay(value).equals(getComponent().getText())) if (!lookup.getDisplay(value).equals(getComponent().getText())){
{ getComponent().setText(lookup.getDisplay(value));
return;
} }
} }else{
actionCombo(null); getComponent().setText("");
actionCombo(null);
}
} }
else else
{ {