details: https://code.openbravo.com/erp/devel/pi/rev/e2c94843708c
changeset: 22653:e2c94843708c
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Mar 07 16:39:14 2014 +0100
summary: Fixed issue 25934: OBTreeGrid now can be included within a skin
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js
| 13 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
| 41 +++++++--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js
| 11 ++
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js
| 4 +
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java
| 4 -
5 files changed, 58 insertions(+), 15 deletions(-)
diffs (188 lines):
diff -r 1527de35db72 -r e2c94843708c
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js
Fri Mar 07 14:09:53 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js
Fri Mar 07 16:39:14 2014 +0100
@@ -133,9 +133,20 @@
};
ds.transformResponse = function (dsResponse, dsRequest, jsonData) {
+ var i, node;
if (jsonData.response.error) {
dsResponse.error = jsonData.response.error;
}
+ if (jsonData.response && jsonData.response.data) {
+ for (i = 0; i < jsonData.response.data.length; i++) {
+ node = jsonData.response.data[i];
+ if (node.showDropIcon) {
+ node.icon = OB.Styles.OBTreeGrid.iconFolder;
+ } else {
+ node.icon = OB.Styles.OBTreeGrid.iconNode;
+ }
+ }
+ }
return this.Super('transformResponse', arguments);
};
@@ -278,7 +289,6 @@
}
},
- pickerIconSrc: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/form/search_picker.png',
filterDialogCallback: function (criteria) {
this.grid.parentElement.setFilterEditorCriteria(criteria);
this.lastValueFromPopup = this.getValue();
@@ -287,6 +297,7 @@
init: function () {
var field;
+ this.pickerIconSrc = OB.Styles.OBFormField.DefaultSearch.pickerIconSrc;
this.Super('init', arguments);
field = this.grid.getField(this.name);
this.criteriaField = field.displayField;
diff -r 1527de35db72 -r e2c94843708c
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 Mar 07 14:09:53 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
Fri Mar 07 16:39:14 2014 +0100
@@ -30,11 +30,19 @@
isc.OBTreeItem.addProperties({
showPickerIcon: true,
- pickerIconSrc: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/form/comboBoxPicker.png',
pickerIconHSpace: 0,
iconHSpace: 0,
tree: null,
init: function () {
+ this.pickerIconSrc = OB.Styles.OBFormField.DefaultComboBox.pickerIconSrc;
+ this.icons = [{
+ src: OB.Styles.OBFormField.DefaultSearch.pickerIconSrc,
+ width: OB.Styles.OBFormField.DefaultSearch.pickerIconWidth,
+ height: OB.Styles.OBFormField.DefaultSearch.pickerIconHeight,
+ click: function (form, item, icon) {
+ item.openTreeWindow();
+ }
+ }];
this.Super('init', arguments);
this.tree = isc.OBTreeItemTree.create({
treeItem: this
@@ -101,15 +109,6 @@
return response;
},
- icons: [{
- src: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/form/search_picker.png',
- width: 21,
- height: 21,
- click: function (form, item, icon) {
- item.openTreeWindow();
- }
- }],
-
openTreeWindow: function () {
var selectedValue = this.getValue(),
criteria, innerCriteria;
@@ -291,9 +290,20 @@
};
ds.transformResponse = function (dsResponse, dsRequest, jsonData) {
+ var i, node;
if (jsonData.response.error) {
dsResponse.error = jsonData.response.error;
}
+ if (jsonData.response && jsonData.response.data) {
+ for (i = 0; i < jsonData.response.data.length; i++) {
+ node = jsonData.response.data[i];
+ if (node.showDropIcon) {
+ node.icon = OB.Styles.OBTreeGrid.iconFolder;
+ } else {
+ node.icon = OB.Styles.OBTreeGrid.iconNode;
+ }
+ }
+ }
return this.Super('transformResponse', arguments);
};
@@ -515,9 +525,20 @@
};
ds.transformResponse = function (dsResponse, dsRequest, jsonData) {
+ var i, node;
if (jsonData.response.error) {
dsResponse.error = jsonData.response.error;
}
+ if (jsonData.response && jsonData.response.data) {
+ for (i = 0; i < jsonData.response.data.length; i++) {
+ node = jsonData.response.data[i];
+ if (node.showDropIcon) {
+ node.icon = OB.Styles.OBTreeGrid.iconFolder;
+ } else {
+ node.icon = OB.Styles.OBTreeGrid.iconNode;
+ }
+ }
+ }
return this.Super('transformResponse', arguments);
};
diff -r 1527de35db72 -r e2c94843708c
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
Fri Mar 07 14:09:53 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js
Fri Mar 07 16:39:14 2014 +0100
@@ -102,6 +102,7 @@
};
ds.transformResponse = function (dsResponse, dsRequest, jsonData) {
+ var i, node;
if (jsonData.response.message) {
me.view.messageBar.setMessage(jsonData.response.message.messageType,
null, jsonData.response.message.message);
} else if (dsRequest.operationType === 'update') {
@@ -110,6 +111,16 @@
if (jsonData.response.error) {
dsResponse.error = jsonData.response.error;
}
+ if (jsonData.response && jsonData.response.data) {
+ for (i = 0; i < jsonData.response.data.length; i++) {
+ node = jsonData.response.data[i];
+ if (node.showDropIcon) {
+ node.icon = OB.Styles.OBTreeGrid.iconFolder;
+ } else {
+ node.icon = OB.Styles.OBTreeGrid.iconNode;
+ }
+ }
+ }
return this.Super('transformResponse', arguments);
};
diff -r 1527de35db72 -r e2c94843708c
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js
Fri Mar 07 14:09:53 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js
Fri Mar 07 16:39:14 2014 +0100
@@ -17,6 +17,10 @@
************************************************************************
*/
+OB.Styles.OBTreeGrid = OB.Styles.OBTreeGrid || {};
+OB.Styles.OBTreeGrid.iconFolder = OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/tree-grid/iconFolder.png';
+OB.Styles.OBTreeGrid.iconNode = OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/tree-grid/iconNode.png';
+
isc.OBTreeGrid.addProperties({
bodyStyleName: 'OBGridBody',
baseStyle: 'OBTreeGridCell',
diff -r 1527de35db72 -r e2c94843708c
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java
Fri Mar 07 14:09:53 2014 +0100
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java
Fri Mar 07 16:39:14 2014 +0100
@@ -74,8 +74,6 @@
private static final String AD_ORG_TABLE_ID = "155";
private static final String ROOT_ORGANIZATION_ID = "0";
private static final String SUMMARY_LEVEL_PROPERTY = "summaryLevel";
- private static final String FOLDER_ICON_SRC =
"../web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/tree-grid/iconFolder.png";
- private static final String LEAF_ICON_SRC =
"../web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/tree-grid/iconNode.png";
@Inject
private DataSourceServiceProvider dataSourceServiceProvider;
@@ -933,11 +931,9 @@
try {
if (!canAcceptDrop(entity, bob)) {
node.put("canBeParentNode", false);
- node.put("icon", LEAF_ICON_SRC);
node.put("showDropIcon", false);
node.put("showOpenIcon", false);
} else {
- node.put("icon", FOLDER_ICON_SRC);
node.put("showDropIcon", true);
}
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
