details: https://code.openbravo.com/erp/devel/pi/rev/405dc93b9f01 changeset: 13806:405dc93b9f01 user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Sep 20 13:36:30 2011 +0200 summary: Prevent js error when having SC logging enabled
details: https://code.openbravo.com/erp/devel/pi/rev/b7f1fe3da01b changeset: 13807:b7f1fe3da01b user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Sep 20 13:37:24 2011 +0200 summary: Fixes issue 18499: "Sales Forecast" new lines are not automatically reflected in the grid Set the correct constructor and operator when creating criteria diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 12 ++++++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diffs (38 lines): diff -r 5eb93b083e35 -r b7f1fe3da01b modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Tue Sep 20 13:33:32 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Tue Sep 20 13:37:24 2011 +0200 @@ -981,14 +981,18 @@ criterion, fldName, length; if (!criteria) { - criteria = { - operator: 'and', - _constructor: "AdvancedCriteria", - criteria:[]}; + criteria = {}; } else { criteria = isc.clone(criteria); } + if (!criteria.operator) { + criteria.operator = 'and'; + } + if (!criteria._constructor) { + criteria._constructor = "AdvancedCriteria"; + } + if (!criteria.criteria) { criteria.criteria = []; } diff -r 5eb93b083e35 -r b7f1fe3da01b modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Tue Sep 20 13:33:32 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Tue Sep 20 13:37:24 2011 +0200 @@ -1417,7 +1417,7 @@ for (i = 0 ; i < length; i++) { recordInfos.push({id: deleteData.ids[i]}); } - view.viewGrid.data.handleUpdate('remove', recordInfos); + view.viewGrid.data.handleUpdate('remove', recordInfos, false, req); if (updateTotalRows) { view.viewGrid.data.totalRows = view.viewGrid.data.getLength(); } ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2dcopy1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
