details: https://code.openbravo.com/erp/devel/pi/rev/21802fa9bc60
changeset: 33198:21802fa9bc60
user: Javier Armendáriz <javier.armendariz <at> openbravo.com>
date: Wed Jan 17 10:06:12 2018 +0100
summary: Fixed bug 37398: Use default value when TreeDatasourceFetchLimit is
not defined
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
| 6 +++---
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
| 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diffs (52 lines):
diff -r 2c78dc4d9f1b -r 21802fa9bc60
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
Fri Jan 19 14:41:38 2018 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
Wed Jan 17 10:06:12 2018 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2013-2017 Openbravo SLU
+ * All portions are Copyright (C) 2013-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -299,7 +299,7 @@
var target = window[dsRequest.componentId];
dsRequest.params = dsRequest.params || {};
dsRequest.params._startRow = 0;
- dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit;
+ dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit ||
OB.Constants.TREE_DS_DEFAULT_FETCH_LIMIT;
dsRequest.params.treeReferenceId = target.treeItem.treeReferenceId;
var contextInfo = target.treeItem.form.view.getContextInfo(false, true);
isc.addProperties(dsRequest.params, contextInfo);
@@ -544,7 +544,7 @@
contextInfo;
dsRequest.params = dsRequest.params || {};
dsRequest.params._startRow = 0;
- dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit;
+ dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit ||
OB.Constants.TREE_DS_DEFAULT_FETCH_LIMIT;
dsRequest.params.treeReferenceId = target.treeItem.treeReferenceId;
contextInfo = target.treeItem.form.view.getContextInfo(false, true);
isc.addProperties(dsRequest.params, contextInfo);
diff -r 2c78dc4d9f1b -r 21802fa9bc60
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
Fri Jan 19 14:41:38 2018 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
Wed Jan 17 10:06:12 2018 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009-2017 Openbravo SLU
+ * All portions are Copyright (C) 2009-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -71,7 +71,8 @@
ERROR : 'error',
IS_PICK_AND_EDIT : '_isPickAndEdit',
SELECTED_PROPERTIES : '_selectedProperties',
- EXTRA_PROPERTIES : '_extraProperties'
+ EXTRA_PROPERTIES : '_extraProperties',
+ TREE_DS_DEFAULT_FETCH_LIMIT : 200
},
Styles : {
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
