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

IDEMPIERE-3240 Web services error when a parameter is range

This commit is contained in:
Diego Ruiz 2016-11-07 18:20:58 +01:00
parent 59ce34cedb
commit 7e632fe9a2
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java
View File

@ -514,7 +514,7 @@ public class Process {
dataField = fmap.get( key+"_2" ); dataField = fmap.get( key+"_2" );
if (dataField != null && !Util.isEmpty(dataField.getVal())) if (dataField != null && !Util.isEmpty(dataField.getVal()))
{ {
valueString2 = dataField.toString(); valueString2 = dataField.getVal();
if (requestCtx != null && valueString2.charAt(0) == '@') if (requestCtx != null && valueString2.charAt(0) == '@')
{ {
Object value = ModelADServiceImpl.parseVariable(m_cs, requestCtx, iPara.getParameterName(), valueString2); Object value = ModelADServiceImpl.parseVariable(m_cs, requestCtx, iPara.getParameterName(), valueString2);
@ -598,12 +598,28 @@ public class Process {
if (pPara.isRange()) if (pPara.isRange())
{ {
if (valueString2 != null && valueString2.length() > 0) { if (valueString2 != null && valueString2.length() > 0) {
if (displayType == DisplayType.DateTime) if (displayType == DisplayType.DateTime) {
d = m_cs.dateTimeFormat.parse(valueString2.toString()); try {
else if (displayType == DisplayType.Time) d = m_cs.dateTimeFormatJDBC.parse(valueString2);
d = m_cs.timeFormat.parse(valueString2.toString()); } catch (ParseException e) {
else d = m_cs.dateTimeFormat.parse(valueString2);
d = m_cs.dateFormat.parse(valueString2.toString()); }
}
else if (displayType == DisplayType.Time) {
try {
d = m_cs.timeFormatJDBC.parse(valueString2);
} catch (ParseException e) {
d = m_cs.timeFormat.parse(valueString2);
}
}
else {
try {
d = m_cs.dateFormatJDBC.parse(valueString2);
} catch (ParseException e) {
d = m_cs.dateFormat.parse(valueString2);
}
}
Timestamp ts = new Timestamp(d.getTime()); Timestamp ts = new Timestamp(d.getTime());
iPara.setP_Date_To(ts); iPara.setP_Date_To(ts);