details: /erp/devel/pi/rev/8ea8be855c61
changeset: 9300:8ea8be855c61
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Dec 21 19:31:39 2010 +0100
summary: [OBCQL] Fix javascript issue.
details: /erp/devel/pi/rev/60da283e0e53
changeset: 9301:60da283e0e53
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Dec 21 19:33:25 2010 +0100
summary: [OBKMO] Order menu items list based on Sequence number.
details: /erp/devel/pi/rev/0f0a6ef6421c
changeset: 9302:0f0a6ef6421c
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Dec 22 13:52:10 2010 +0100
summary: ClientApplication.Add methods to export grid data.
details: /erp/devel/pi/rev/98c9527c7b9d
changeset: 9303:98c9527c7b9d
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Dec 22 13:52:48 2010 +0100
summary: [OBCQL] Changes on export to csv due to new exportData
implementation.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/index.html
| 4 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 18 ++++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 19 +++++++++
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
| 21 ++++++---
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
| 10 +++-
5 files changed, 62 insertions(+), 10 deletions(-)
diffs (147 lines):
diff -r 2343ebea8e62 -r 98c9527c7b9d
modules/org.openbravo.client.application/web/org.openbravo.client.application/index.html
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/index.html
Wed Dec 22 13:11:42 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/index.html
Wed Dec 22 13:52:48 2010 +0100
@@ -26,6 +26,7 @@
OB.Layout.draw();
OB.Layout.ViewManager.createAddStartTab();
isc.clearPrompt();
+ OB.globalHiddenForm = document.forms.globalHiddenForm;
}
</script>
@@ -45,5 +46,8 @@
<script type="text/javascript"
src="../../org.openbravo.client.kernel/OBCLKER_Kernel/StaticResources?_skinVersion=3.00"></script>
+<form name="globalHiddenForm" method="post" action="blank.html"></form>
+
+
</body>
</html>
\ No newline at end of file
diff -r 2343ebea8e62 -r 98c9527c7b9d
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Wed Dec 22 13:11:42 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Wed Dec 22 13:52:48 2010 +0100
@@ -19,4 +19,22 @@
isc.ClassFactory.defineClass('OBGrid', isc.ListGrid);
+isc.OBGrid.addProperties({
+ exportData: function(requestProperties, additionalProperties) {
+ // var criteria = this.getCriteria();
+ var dsURL = this.dataSource.dataURL;
+ var data = {
+ _dataSource: this.dataSource.ID,
+ _operationType: 'fetch',
+ exportFormat: 'csv',
+ exportToFile: (requestProperties
+ && requestProperties.params
+ && requestProperties.params.exportToFile)
+ };
+ isc.addProperties(data, additionalProperties);
+
+ OB.Utilities.postThroughHiddenFrame(dsURL, data);
+ }
+});
+
isc.ClassFactory.defineClass('OBGridHeaderImgButton', isc.ImgButton);
\ No newline at end of file
diff -r 2343ebea8e62 -r 98c9527c7b9d
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Wed Dec 22 13:11:42 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Wed Dec 22 13:52:48 2010 +0100
@@ -854,4 +854,23 @@
//button.parentElement.parentElement.view.getContextInfo()
};
+OB.Utilities.postThroughHiddenFrame = function(url, data) {
+ OB.globalHiddenForm.setAttribute('action', url);
+
+// for (var child in OB.globalHiddenForm.children) {
+// OB.globalHiddenForm.removeChild(child);
+// }
+
+ for (var key in data) {
+ var field = document.createElement('input');
+ field.setAttribute('type', 'hidden');
+ field.setAttribute('name', key);
+ field.setAttribute('value', data[key]);
+
+ OB.globalHiddenForm.appendChild(field);
+ }
+
+ OB.globalHiddenForm.submit();
+}
+
diff -r 2343ebea8e62 -r 98c9527c7b9d
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
Wed Dec 22 13:11:42 2010 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
Wed Dec 22 13:52:48 2010 +0100
@@ -18,7 +18,6 @@
*/
package org.openbravo.client.myob;
-import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
@@ -85,12 +84,7 @@
static JSONArray getWidgetMenuItems(WidgetClass widgetClass) {
final JSONArray result = new JSONArray();
- List<WidgetClassMenu> menuItems = new ArrayList<WidgetClassMenu>();
- if (widgetClass.getWidgetSuperclass() != null) {
- menuItems =
widgetClass.getWidgetSuperclass().getOBKMOWidgetClassMenuList();
- } else {
- menuItems = widgetClass.getOBKMOWidgetClassMenuList();
- }
+ List<WidgetClassMenu> menuItems =
MyOBUtils.getWidgetClassMenuItemsList(widgetClass);
for (WidgetClassMenu menuItem : menuItems) {
final JSONObject item = new JSONObject();
@@ -114,6 +108,19 @@
return result;
}
+ private static List<WidgetClassMenu> getWidgetClassMenuItemsList(WidgetClass
widgetClass) {
+ OBCriteria<WidgetClassMenu> obcMenuItems =
OBDal.getInstance().createCriteria(
+ WidgetClassMenu.class);
+ if (widgetClass.getWidgetSuperclass() != null) {
+ obcMenuItems.add(Expression.eq(WidgetClassMenu.PROPERTY_WIDGETCLASS,
widgetClass
+ .getWidgetSuperclass()));
+ } else {
+ obcMenuItems.add(Expression.eq(WidgetClassMenu.PROPERTY_WIDGETCLASS,
widgetClass));
+ }
+ obcMenuItems.addOrderBy(WidgetClassMenu.PROPERTY_SEQUENCE, true);
+ return obcMenuItems.list();
+ }
+
/**
* Creates the widgetProvider from the widgetClass object. Also calls/sets
the
* {...@link WidgetProvider#setWidgetClass(WidgetClass)}.
diff -r 2343ebea8e62 -r 98c9527c7b9d
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
---
a/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
Wed Dec 22 13:11:42 2010 +0100
+++
b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
Wed Dec 22 13:52:48 2010 +0100
@@ -93,8 +93,12 @@
params: {
exportToFile: true
}
- }
- grid.exportData(requestProperties);
+ };
+ var additionalProperties = {
+ widgetInstanceId: this.widget.dbInstanceId
+ };
+
+ grid.exportData(requestProperties, additionalProperties);
}
});
@@ -157,7 +161,7 @@
requestProperties = {};
}
requestProperties.showPrompt = false;
- if (requestProperties.params.exportToFile) {
+ if (requestProperties.params && requestProperties.params.exportToFile) {
this.dataSource.dataFormat = requestProperties.exportAs;
} else {
this.dataSource.dataFormat = 'json';
------------------------------------------------------------------------------
Forrester recently released a report on the Return on Investment (ROI) of
Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even
within 7 months. Over 3 million businesses have gone Google with Google Apps:
an online email calendar, and document program that's accessible from your
browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
