details: /erp/devel/pi/rev/5a78c692d93c
changeset: 10413:5a78c692d93c
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Feb 07 19:24:10 2011 +0100
summary: Added implicit default for boolean datatypes. Added filter for the
'null' string
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BooleanUIDefinition.java
| 22 ++++++++++
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
| 17 +++++++
3 files changed, 40 insertions(+), 1 deletions(-)
diffs (81 lines):
diff -r 9c281083cde2 -r 5a78c692d93c
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BooleanUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BooleanUIDefinition.java
Mon Feb 07 19:03:56 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BooleanUIDefinition.java
Mon Feb 07 19:24:10 2011 +0100
@@ -18,6 +18,11 @@
*/
package org.openbravo.client.kernel.reference;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.model.ad.ui.Field;
+
/**
* Implementation of the boolean ui definition.
*
@@ -63,4 +68,21 @@
}
return "N";
}
+
+ @Override
+ public String getFieldProperties(Field field, boolean getValueFromSession) {
+ String result = super.getFieldProperties(field, getValueFromSession);
+ if (!getValueFromSession && field.getColumn().getDefaultValue() == null) {
+ JSONObject jsnobject;
+ try {
+ jsnobject = new JSONObject(result);
+ jsnobject.put("value", createFromClassicString("N"));
+ jsnobject.put("classicValue", "N");
+ return jsnobject.toString();
+ } catch (JSONException e) {
+ throw new OBException("Exception when parsing boolean value", e);
+ }
+ }
+ return result;
+ }
}
diff -r 9c281083cde2 -r 5a78c692d93c
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Mon Feb 07 19:03:56 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Mon Feb 07 19:24:10 2011 +0100
@@ -191,7 +191,7 @@
}
}
}
- if (columnValue == null) {
+ if (columnValue == null || columnValue.equals("null")) {
columnValue = "";
}
JSONObject jsnobject = new JSONObject();
diff -r 9c281083cde2 -r 5a78c692d93c
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
Mon Feb 07 19:03:56 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
Mon Feb 07 19:24:10 2011 +0100
@@ -18,6 +18,7 @@
*/
package org.openbravo.client.kernel.reference;
+import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.openbravo.base.exception.OBException;
import org.openbravo.model.ad.ui.Field;
@@ -92,4 +93,20 @@
return "N";
}
+ @Override
+ public String getFieldProperties(Field field, boolean getValueFromSession) {
+ String result = super.getFieldProperties(field, getValueFromSession);
+ if (!getValueFromSession && field.getColumn().getDefaultValue() == null) {
+ JSONObject jsnobject;
+ try {
+ jsnobject = new JSONObject(result);
+ jsnobject.put("value", createFromClassicString("N"));
+ jsnobject.put("classicValue", "N");
+ return jsnobject.toString();
+ } catch (JSONException e) {
+ throw new OBException("Exception when parsing boolean value", e);
+ }
+ }
+ return result;
+ }
}
------------------------------------------------------------------------------
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
