details: https://code.openbravo.com/erp/devel/pi/rev/6a99934dbfc9
changeset: 16574:6a99934dbfc9
user: Miguel de Juana <miguel.dejuana <at> openbravo.com>
date: Fri May 18 14:23:27 2012 +0200
summary: Related to issue 20496: Backout error dateTime ProcessMonitor and
code format
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
| 29 ++++-----
1 files changed, 14 insertions(+), 15 deletions(-)
diffs (76 lines):
diff -r e2957cd09cc5 -r 6a99934dbfc9
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
Thu May 17 19:42:09 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
Fri May 18 14:23:27 2012 +0200
@@ -600,9 +600,9 @@
// store grid editing information which can be used when the fic returns
// this is needed as after the fic return the edit row may have changed.
var gridEditInformation = this.view.viewGrid.getEditForm() ? {
- grid: this.view.viewGrid,
- editRow: this.view.viewGrid.getEditRow()
- } : null;
+ grid: this.view.viewGrid,
+ editRow: this.view.viewGrid.getEditRow()
+ } : null;
this.inFicCall = true;
@@ -704,8 +704,8 @@
calloutMessages = data.calloutMessages,
auxInputs = data.auxiliaryInputValues,
prop, value, i, j, dynamicCols = data.dynamicCols,
- sessionAttributes = data.sessionAttributes, editValues,
- item, section, retHiddenInputs = data.hiddenInputs;
+ sessionAttributes = data.sessionAttributes,
+ editValues, item, section, retHiddenInputs = data.hiddenInputs;
// edit row has changed when returning, don't update the form anymore
if (this.grid && gridEditInformation && this.grid.getEditRow() !==
gridEditInformation.editRow) {
@@ -909,7 +909,7 @@
var typeInstance;
var assignValue;
var assignClassicValue;
- var isDate, isTime, i, valueMap = {},
+ var isDate, i, valueMap = {},
oldValue, field = this.getFieldFromColumnName(columnName),
entries = columnValue.entries;
// not a field on the form, probably a datasource field
@@ -962,11 +962,10 @@
// note: do not use clearvalue as this removes the value from the form
this.setValue(field.name, null);
} else if (columnValue.value || columnValue.value === 0 ||
columnValue.value === false) {
- isDate = field.type && (isc.SimpleType.getType(field.type).inheritsFrom
=== 'date' || isc.SimpleType.getType(field.type).inheritsFrom === 'datetime');
- isTime = field.type && isc.SimpleType.getType(field.type).inheritsFrom
=== 'time';
- if (isTime) {
+ isDate = field.type && (isc.SimpleType.getType(field.type).inheritsFrom
=== 'date' || isc.SimpleType.getType(field.type).inheritsFrom === 'datetime' ||
isc.SimpleType.getType(field.type).inheritsFrom === 'time');
+ if (isDate) {
this.setItemValue(field.name,
isc.Date.parseSchemaDate(columnValue.value));
- } else if (isDate || columnValue.hasDateDefault) {
+ } else if (columnValue.hasDateDefault) {
this.setItemValue(field.name, columnValue.classicValue);
} else {
@@ -1097,9 +1096,9 @@
textValue = OB.Utilities.Number.OBMaskedToOBPlain(textValue,
type.decSeparator, type.groupSeparator);
textValue = textValue.replace(type.decSeparator, '.');
}
-
+
this.setValue(fldName + '_textualValue', textValue);
-
+
if (gridEditInformation) {
gridEditInformation.grid.setEditValue(gridEditInformation.editRow,
fldName + '_textualValue', textValue, true, true);
} else if (this.grid && this.grid.isEditing()) {
@@ -1233,9 +1232,9 @@
// store grid editing information which can be used when the fic returns
// this is needed as after the fic return the edit row may have changed.
var gridEditInformation = this.view.viewGrid.isEditing() ? {
- grid: this.view.viewGrid,
- editRow: this.view.viewGrid.getEditRow()
- } : null;
+ grid: this.view.viewGrid,
+ editRow: this.view.viewGrid.getEditRow()
+ } : null;
OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent',
allProperties, requestParams, function (response, data, request) {
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
