details: /erp/devel/pi/rev/6303f1408f1a
changeset: 13013:6303f1408f1a
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Jun 30 11:47:17 2011 +0200
summary: Issue 17822: Rollback toolbar changes
details: /erp/devel/pi/rev/f6fe9f48c622
changeset: 13014:f6fe9f48c622
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Jun 30 11:53:22 2011 +0200
summary: Fixes issue 17822: Added restriction on export to CSV
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 25 +-----
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
| 46 ++++++---
2 files changed, 33 insertions(+), 38 deletions(-)
diffs (105 lines):
diff -r 6eb0b8ef123b -r f6fe9f48c622
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Thu Jun 30 09:21:54 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Thu Jun 30 11:53:22 2011 +0200
@@ -195,28 +195,8 @@
keyboardShortcutId: 'ToolBar_Undo'
},
EXPORT_BUTTON_PROPERTIES: {
- action: function() {
- var requestProperties, activateButton;
-
- activateButton = isc.addProperties({}, isc.Dialog.OK, {
- getTitle: function() {
- return OB.I18N.getLabel('OBKMO_LearnMore');
- },
- click: function() {
- this.topElement.cancelClick();
- window.open('http://www.openbravo.com/product/erp/get-basic/');
- }});
-
- if(OB.Application.licenseType === 'C') {
- isc.confirm(OB.I18N.getLabel('OBUIAPP_ActivateMessage'), {
- isModal: true,
- showModalMask: true,
- toolbarButtons: [activateButton, isc.Dialog.CANCEL]
- });
- return;
- }
-
- requestProperties = {
+ action: function(){
+ var requestProperties = {
exportAs: 'csv',
exportDisplay: 'download',
params: {
@@ -225,7 +205,6 @@
viewState: this.view.viewGrid.getViewState(),
tab: this.view.tabId
};
-
this.view.viewGrid.exportData(requestProperties);
},
disabled: false,
diff -r 6eb0b8ef123b -r f6fe9f48c622
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
Thu Jun 30 09:21:54 2011 +0200
+++
b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
Thu Jun 30 11:53:22 2011 +0200
@@ -43,9 +43,6 @@
isc.OBQueryListRowsNumberLabel.create({
contents: ''
}),
-// isc.HLayout.create({
-// width: '100%'
-// }),
isc.OBQueryListShowAllLabel.create({
contents: OB.I18N.getLabel('OBCQL_ShowAll'),
widget: this,
@@ -120,18 +117,37 @@
},
exportGrid: function() {
- var grid = this.widget.grid;
- var requestProperties = {
- exportAs: 'csv',
- //exportFilename: 'Query/List_widget.csv',
- exportDisplay: 'download',
- params: {
- exportToFile: true
- }
- };
- var additionalProperties = {
- widgetInstanceId: this.widget.dbInstanceId
- };
+ var grid = this.widget.grid, requestProperties, additionalProperties,
+ activateButton = isc.addProperties({}, isc.Dialog.OK, {
+ getTitle: function() {
+ return OB.I18N.getLabel('OBKMO_LearnMore');
+ },
+ click: function() {
+ this.topElement.cancelClick();
+ window.open('http://www.openbravo.com/product/erp/get-basic/');
+ }});
+
+ if (OB.Application.licenseType === 'C') {
+ isc.confirm(OB.I18N.getLabel('OBUIAPP_ActivateMessage'), {
+ isModal: true,
+ showModalMask: true,
+ toolbarButtons: [activateButton, isc.Dialog.CANCEL]
+ });
+
+ return;
+ }
+
+ requestProperties = {
+ exportAs: 'csv',
+ exportDisplay: 'download',
+ params: {
+ exportToFile: true
+ }
+ };
+
+ additionalProperties = {
+ widgetInstanceId: this.widget.dbInstanceId
+ };
grid.exportData(requestProperties, additionalProperties);
},
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
