details: https://code.openbravo.com/erp/devel/pi/rev/8e3bca6e8153
changeset: 15552:8e3bca6e8153
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Feb 20 23:53:10 2012 +0100
summary: Related to issue 18557: Filter Expression: comparing to other field
(column) values
Also handle illegal filter values in a nicer way using a message
diffstat:
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MESSAGE.xml
| 11 ++++++++++
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
| 5 +--
2 files changed, 13 insertions(+), 3 deletions(-)
diffs (35 lines):
diff -r a1d540356aa9 -r 8e3bca6e8153
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Feb 20 22:06:59 2012 +0100
+++
b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Feb 20 23:53:10 2012 +0100
@@ -1,5 +1,16 @@
<?xml version='1.0' encoding='UTF-8'?>
<data>
+<!--0611ACA6E69841D7AC7D7F34308E2780--><AD_MESSAGE>
+<!--0611ACA6E69841D7AC7D7F34308E2780-->
<AD_MESSAGE_ID><![CDATA[0611ACA6E69841D7AC7D7F34308E2780]]></AD_MESSAGE_ID>
+<!--0611ACA6E69841D7AC7D7F34308E2780-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0611ACA6E69841D7AC7D7F34308E2780--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0611ACA6E69841D7AC7D7F34308E2780--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0611ACA6E69841D7AC7D7F34308E2780-->
<VALUE><![CDATA[OBJSON_InvalidFilterValue]]></VALUE>
+<!--0611ACA6E69841D7AC7D7F34308E2780--> <MSGTEXT><![CDATA[Invalid filter
value %0.]]></MSGTEXT>
+<!--0611ACA6E69841D7AC7D7F34308E2780--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--0611ACA6E69841D7AC7D7F34308E2780-->
<AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
+<!--0611ACA6E69841D7AC7D7F34308E2780--></AD_MESSAGE>
+
<!--3038E4EC493149F08F9701F22B89176B--><AD_MESSAGE>
<!--3038E4EC493149F08F9701F22B89176B-->
<AD_MESSAGE_ID><![CDATA[3038E4EC493149F08F9701F22B89176B]]></AD_MESSAGE_ID>
<!--3038E4EC493149F08F9701F22B89176B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r a1d540356aa9 -r 8e3bca6e8153
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
---
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
Mon Feb 20 22:06:59 2012 +0100
+++
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
Mon Feb 20 23:53:10 2012 +0100
@@ -524,9 +524,8 @@
try {
localValue = getTypeSafeValue(operator, property, localValue);
} catch (IllegalArgumentException e) {
- typedParameters.add(null);
- // ignore errors in formatting etc to be robust
- return null;
+ throw new OBException(Utility.getI18NMessage("OBJSON_InvalidFilterValue",
+ new String[] { value != null ? value.toString() : "" }));
}
typedParameters.add(localValue);
return clause;
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
