details: https://code.openbravo.com/erp/devel/pi/rev/6f808eb12d3d
changeset: 35262:6f808eb12d3d
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Dec 21 09:01:36 2018 +0100
summary: related to bug 39644: code cleanup
Removed redundant criteria parameter as it can be obtained from queryService.
diffstat:
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
| 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (26 lines):
diff -r 151603a4e223 -r 6f808eb12d3d
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
---
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
Thu Dec 20 20:28:07 2018 +0000
+++
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
Fri Dec 21 09:01:36 2018 +0100
@@ -358,7 +358,7 @@
List<BaseOBObject> gridRows = bobs;
try {
- selected = getAllSelectedRecords(queryService, criteria);
+ selected = getAllSelectedRecords(queryService);
int idsOutOfCurrentPage = selected.size() - selectionInCurrentPage;
selected.addAll(unselected);
@@ -376,9 +376,10 @@
return gridRows;
}
- /** Note side effect: criteria gets modified */
- private List<BaseOBObject> getAllSelectedRecords(DataEntityQueryService
queryService,
- JSONObject criteria) throws JSONException {
+ /** Note side effect: queryService's criteria gets modified */
+ private List<BaseOBObject> getAllSelectedRecords(DataEntityQueryService
queryService)
+ throws JSONException {
+ JSONObject criteria = queryService.getQueryBuilder().getCriteria();
JSONArray criteriaFields = criteria.getJSONArray("criteria");
JSONArray crieriaIdFields = new JSONArray();
for (int i = 0; i < criteriaFields.length(); i++) {
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
