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

Revert "IDEMPIERE-4770 - fix advanced find and/or where clause (#931)" (#933) 

This reverts commit bba2be3514.
This commit is contained in:
hengsin 2021-10-18 20:44:08 +08:00 committed by GitHub
parent bba2be3514
commit 6a56596f10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -1043,6 +1043,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
// And / Or / And Not / Or Not // And / Or / And Not / Or Not
ValueNamePair[] andOr = new ValueNamePair[] { ValueNamePair[] andOr = new ValueNamePair[] {
new ValueNamePair ("", ""),
new ValueNamePair ("AND", Msg.getMsg(Env.getCtx(),"AND")), new ValueNamePair ("AND", Msg.getMsg(Env.getCtx(),"AND")),
new ValueNamePair ("OR", Msg.getMsg(Env.getCtx(),"OR")), new ValueNamePair ("OR", Msg.getMsg(Env.getCtx(),"OR")),
new ValueNamePair ("AND NOT", Msg.getMsg(Env.getCtx(),"ANDNOT")), new ValueNamePair ("AND NOT", Msg.getMsg(Env.getCtx(),"ANDNOT")),
@ -1051,10 +1052,11 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
for (ValueNamePair item: andOr) for (ValueNamePair item: andOr)
listAndOr.appendItem(item.getName(), item.getValue()); listAndOr.appendItem(item.getName(), item.getValue());
listAndOr.setSelectedIndex(0); //And - default
if (row<=0){ // don't show item on the first row. if (row<=0){ // don't show item on the first row.
listAndOr.setSelectedIndex(0);
listAndOr.setVisible(false); listAndOr.setVisible(false);
} else { } else {
listAndOr.setSelectedIndex(1); //And - default
listAndOr.setVisible(true); listAndOr.setVisible(true);
} }