details: /erp/devel/pi/rev/de0c1c1c9a27
changeset: 11143:de0c1c1c9a27
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Mar 09 13:19:21 2011 +0100
summary: Fix regression qa. Now password changed be entered & changed again.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 4 ++--
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java
| 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diffs (37 lines):
diff -r ea0e4ccba637 -r de0c1c1c9a27
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Wed Mar 09 13:13:14 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Wed Mar 09 13:19:21 2011 +0100
@@ -325,7 +325,7 @@
isc.OBEncryptedItem.addProperties({
operator: 'iContains',
changed : function(form,item,value) {
- this.form.setValue(item.name + '.cleartext', value);
+ this.form.setValue(item.name + '_cleartext', value);
}
});
@@ -1424,4 +1424,4 @@
return OB.Utilities.Number.IsValidValueString(type,
item.getElementValue());
}
}]
-});
\ No newline at end of file
+});
diff -r ea0e4ccba637 -r de0c1c1c9a27
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java
---
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java
Wed Mar 09 13:13:14 2011 +0100
+++
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java
Wed Mar 09 13:19:21 2011 +0100
@@ -389,11 +389,11 @@
final Property property = entity.getProperty(keyName);
if (property.getDomainType() instanceof EncryptedStringDomainType
|| property.getDomainType() instanceof HashedStringDomainType) {
- if (jsonObject.has(keyName + ".cleartext")) {
- Object valCleartext = jsonObject.get(keyName + ".cleartext");
+ if (jsonObject.has(keyName + "_cleartext")) {
+ Object valCleartext = jsonObject.get(keyName + "_cleartext");
setValue(obObject, property, valCleartext);
} else {
- // no .cleartext value found -> skipping field
+ // no _cleartext value found -> skipping field
}
} else {
setValue(obObject, property, jsonObject.get(keyName));
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
