details: https://code.openbravo.com/erp/devel/pi/rev/d29767ae452d changeset: 29614:d29767ae452d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 14 10:08:38 2016 +0200 summary: related to bug 33143: property field not visible in tree grid view
Code clean up: tree grid sent _selectedProperties parameter which was parsed in backend but never used. Now client does not send this info and backend does not parse it. details: https://code.openbravo.com/erp/devel/pi/rev/965d952d7045 changeset: 29615:965d952d7045 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jun 14 10:11:45 2016 +0200 summary: fixed bug 33143: property field not visible in tree grid view Tree grid didn't implement property fields management. Now it is implemented by sending from client the additional properties defined in the tree's standard view's grid and making use of it when convering BOBs to JSONs. diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 4 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 23 +-------- 2 files changed, 5 insertions(+), 22 deletions(-) diffs (93 lines): diff -r 72f63dfd90cd -r 965d952d7045 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js Mon Jun 13 14:14:17 2016 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js Tue Jun 14 10:11:45 2016 +0200 @@ -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-2014 Openbravo SLU + * All portions are Copyright (C) 2013-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -91,11 +91,11 @@ me.parentTabRecordId = me.getParentTabRecordId(); dsRequest.params.parentRecordId = me.parentTabRecordId; dsRequest.params.tabId = me.view.tabId; + dsRequest.params._extraProperties = me.view.dataSource && me.view.dataSource.requestProperties.params._extraProperties; if (dsRequest.dropIndex || dsRequest.dropIndex === 0) { //Only send the index if the tree is ordered dsRequest = me.addOrderedTreeParameters(dsRequest); } - dsRequest.params._selectedProperties = me.getSelectedPropertiesString(); // Includes the context, it could be used in the hqlwhereclause isc.addProperties(dsRequest.params, me.view.getContextInfo(true, false)); dsRequest.willHandleError = true; diff -r 72f63dfd90cd -r 965d952d7045 modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java --- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java Mon Jun 13 14:14:17 2016 +0200 +++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java Tue Jun 14 10:11:45 2016 +0200 @@ -51,7 +51,6 @@ import org.openbravo.erpCommon.businessUtility.Preferences; import org.openbravo.model.ad.datamodel.Table; import org.openbravo.model.ad.domain.ReferencedTree; -import org.openbravo.model.ad.domain.ReferencedTreeField; import org.openbravo.model.ad.system.Client; import org.openbravo.model.ad.ui.Tab; import org.openbravo.model.ad.utility.TableTree; @@ -196,19 +195,9 @@ String tabId = parameters.get("tabId"); String treeReferenceId = parameters.get("treeReferenceId"); Tab tab = null; - JSONArray selectedProperties = null; if (tabId != null) { tab = OBDal.getInstance().get(Tab.class, tabId); - String selectedPropertiesStr = parameters.get("_selectedProperties"); - selectedProperties = new JSONArray(selectedPropertiesStr); - } else if (treeReferenceId != null) { - ReferencedTree treeReference = OBDal.getInstance().get(ReferencedTree.class, treeReferenceId); - treeReference.getADReferencedTreeFieldList(); - selectedProperties = new JSONArray(); - for (ReferencedTreeField treeField : treeReference.getADReferencedTreeFieldList()) { - selectedProperties.put(treeField.getProperty()); - } - } else { + } else if (treeReferenceId == null) { logger .error("A request to the TreeDatasourceService must include the tabId or the treeReferenceId parameter"); return new JSONArray(); @@ -219,6 +208,7 @@ Entity entity = ModelProvider.getInstance().getEntityByTableId(tree.getTable().getId()); final DataToJsonConverter toJsonConverter = OBProvider.getInstance().get( DataToJsonConverter.class); + toJsonConverter.setAdditionalProperties(JsonUtils.getAdditionalProperties(parameters)); // Joins the ADTreeNode with the referenced table StringBuilder joinClause = new StringBuilder(); @@ -563,19 +553,11 @@ String tableId = null; String referencedTableId = parameters.get("referencedTableId"); String treeReferenceId = parameters.get("treeReferenceId"); - JSONArray selectedProperties = null; if (referencedTableId != null) { tableId = referencedTableId; - String selectedPropertiesStr = parameters.get("_selectedProperties"); - selectedProperties = new JSONArray(selectedPropertiesStr); } else if (treeReferenceId != null) { ReferencedTree treeReference = OBDal.getInstance().get(ReferencedTree.class, treeReferenceId); - treeReference.getADReferencedTreeFieldList(); tableId = treeReference.getTable().getId(); - selectedProperties = new JSONArray(); - for (ReferencedTreeField treeField : treeReference.getADReferencedTreeFieldList()) { - selectedProperties.put(treeField.getProperty()); - } } else { logger .error("A request to the TreeDatasourceService must include the tabId or the treeReferenceId parameter"); @@ -650,6 +632,7 @@ final DataToJsonConverter toJsonConverter = OBProvider.getInstance().get( DataToJsonConverter.class); + toJsonConverter.setAdditionalProperties(JsonUtils.getAdditionalProperties(parameters)); JSONObject json = null; try { ------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
