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

IDEMPIERE-925 Date field shows error for incorrect format but allow user to proceed on ok button / peer review

This commit is contained in:
Juan David Arboleda 2013-05-31 18:06:48 -05:00
parent 1a54f69c34
commit e11d43b059
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1337,16 +1337,16 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
Object value = null; Object value = null;
//Allowing Date validation before save //Allowing Date validation before save
List<Component> compoList = cellQueryFrom.getChildren(); Component compo = cellQueryFrom.getFirstChild();
if(compoList.get(0) instanceof Datebox) { if(compo instanceof Datebox) {
Datebox dbox = (Datebox)compoList.get(0); Datebox dbox = (Datebox)compo;
if(dbox.getValue() != null) if(dbox.getValue() != null)
value = new Timestamp(((Date)dbox.getValue()).getTime()); value = new Timestamp(((Date)dbox.getValue()).getTime());
} }
else if(compoList.get(0) instanceof DatetimeBox) { else if(compo instanceof DatetimeBox) {
DatetimeBox dtbox = (DatetimeBox)compoList.get(0); DatetimeBox dtbox = (DatetimeBox)compo;
if(dtbox.getValue() != null) if(dtbox.getValue() != null)
value = new Timestamp(((Date)dtbox.getValue()).getTime()); value = new Timestamp(((Date)dtbox.getValue()).getTime());
} }
else { else {
value = cellQueryFrom.getAttribute("value"); value = cellQueryFrom.getAttribute("value");
@ -1391,16 +1391,16 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
ListCell cellQueryTo = (ListCell)row.getFellow("cellQueryTo"+row.getId()); ListCell cellQueryTo = (ListCell)row.getFellow("cellQueryTo"+row.getId());
//Allowing Date validation before save //Allowing Date validation before save
compoList = cellQueryTo.getChildren(); compo = cellQueryTo.getFirstChild();
if(compoList.get(0) instanceof Datebox) { if(compo instanceof Datebox) {
Datebox dbox = (Datebox)compoList.get(0); Datebox dbox = (Datebox)compo;
if(dbox.getValue() != null) if(dbox.getValue() != null)
value2 = new Timestamp(((Date)dbox.getValue()).getTime()); value2 = new Timestamp(((Date)dbox.getValue()).getTime());
} }
else if(compoList.get(0) instanceof DatetimeBox) { else if(compo instanceof DatetimeBox) {
DatetimeBox dtbox = (DatetimeBox)compoList.get(0); DatetimeBox dtbox = (DatetimeBox)compo;
if(dtbox.getValue() != null) if(dtbox.getValue() != null)
value2 = new Timestamp(((Date)dtbox.getValue()).getTime()); value2 = new Timestamp(((Date)dtbox.getValue()).getTime());
} }
else { else {
value2 = cellQueryFrom.getAttribute("value"); value2 = cellQueryFrom.getAttribute("value");