details: /erp/devel/pi/rev/89a3303a9b86
changeset: 12426:89a3303a9b86
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed May 25 11:51:01 2011 +0200
summary: When a callout returns a null List-reference combo, it will also be
emptied.
details: /erp/devel/pi/rev/ec94a30e8eb9
changeset: 12427:ec94a30e8eb9
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed May 25 12:11:57 2011 +0200
summary: Fixed issue 17349. Selected value of combos will be reset when a
callout sets its value to ''
details: /erp/devel/pi/rev/9eac8c7e50a5
changeset: 12428:9eac8c7e50a5
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed May 25 12:19:36 2011 +0200
summary: Fixed issue 17350. All the BuildValidations will always be executed
on update.database
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 3 ++-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 1 +
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
| 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diffs (36 lines):
diff -r 0f8274676fcf -r 9eac8c7e50a5
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Wed May 25 12:06:44 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Wed May 25 12:19:36 2011 +0200
@@ -1137,7 +1137,8 @@
}
String jsonStr =
uiDef.getFieldProperties(inpFields.get(name), true);
JSONObject jsonobj = new JSONObject(jsonStr);
- if (el == null && uiDef instanceof
ForeignKeyUIDefinition) {
+ if (el == null
+ && (uiDef instanceof ForeignKeyUIDefinition || uiDef
instanceof EnumUIDefinition)) {
// Special case for null values for combos: we must
clean the combo values
jsonobj.put("value", "");
jsonobj.put("classicValue", "");
diff -r 0f8274676fcf -r 9eac8c7e50a5
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
Wed May 25 12:06:44 2011 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Wed May 25 12:19:36 2011 +0200
@@ -445,6 +445,7 @@
ArrayList<String> possibleIds = new ArrayList<String>();
// If column is mandatory we add an initial blank value
if (!field.getColumn().isMandatory()) {
+ possibleIds.add("");
JSONObject entry = new JSONObject();
entry.put(JsonConstants.ID, (String) null);
entry.put(JsonConstants.IDENTIFIER, (String) null);
diff -r 0f8274676fcf -r 9eac8c7e50a5
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
--- a/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Wed May 25 12:06:44 2011 +0200
+++ b/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Wed May 25 12:19:36 2011 +0200
@@ -28,7 +28,7 @@
public static void main(String[] args) {
basedir = new File(args[0]);
- module = args[1];
+ module = null; // The module is not set so that all BuildValidations are
always executed.
PropertyConfigurator.configure("log4j.lcf");
List<String> classes = new ArrayList<String>();
ArrayList<File> modFolders = new ArrayList<File>();
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits