details: https://code.openbravo.com/erp/devel/pi/rev/c1f6e19bd4bf
changeset: 24276:c1f6e19bd4bf
user: Augusto Mauch <augusto.mauch <at> openbravo.com>
date: Tue Aug 19 14:53:59 2014 +0200
summary: Fixes issue 27297: Bad behavior when a record is created with lazy
filtering
There was one case that was not being considered: Clicking the 'Apply filters'
icon just after creating a new record without any criteria applied. It was not
working because it was expecting the grid data not to be a ResultSet, but now
it is a ResultSet.
To fix this, a new flag has been created to specify when the grid has yet to
load its data.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
| 3 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
| 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diffs (27 lines):
diff -r cf2476a790bf -r c1f6e19bd4bf
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
Tue Aug 19 12:39:04 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
Tue Aug 19 14:53:59 2014 +0200
@@ -704,11 +704,12 @@
delete grid.filterHasChanged;
delete grid.sortingHasChanged;
delete grid._filteringAndSortingManually;
- } else if (!isc.isA.ResultSet(grid.data)) {
+ } else if (!isc.isA.ResultSet(grid.data) ||
grid.serverDataNotLoaded) {
// The initial data has not been loaded yet, refreshGrid
// refreshGrid applies also the current sorting
grid.refreshGrid();
delete grid.sortingHasChanged;
+ delete grid.serverDataNotLoaded;
} else if (grid.sortingHasChanged) {
grid.setSort(grid.savedSortSpecifiers, true);
delete grid.sortingHasChanged;
diff -r cf2476a790bf -r c1f6e19bd4bf
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
Tue Aug 19 12:39:04 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
Tue Aug 19 14:53:59 2014 +0200
@@ -1302,4 +1302,5 @@
grid.dataProperties.useClientFiltering = false;
grid.dataProperties.manualResultSet = true;
grid.setData(grid.createDataModel());
+ grid.serverDataNotLoaded = true;
};
\ No newline at end of file
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
