details: /erp/devel/pi/rev/10c07f84553f
changeset: 9484:10c07f84553f
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Dec 30 17:41:17 2010 +0100
summary: [OBKMO] Added canDelete property on widgets to disable deleteWidget
option.
details: /erp/devel/pi/rev/15f23ade6a08
changeset: 9485:15f23ade6a08
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Dec 30 17:42:13 2010 +0100
summary: [OBCQL] Fixed menu items and refresh on Maximized view.
diffstat:
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
| 4 +++
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-view.js
| 11 ++++++++-
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
| 10 +++++++-
3 files changed, 21 insertions(+), 4 deletions(-)
diffs (83 lines):
diff -r 7191314bb53e -r 15f23ade6a08
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
---
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
Thu Dec 30 14:13:36 2010 +0100
+++
b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
Thu Dec 30 17:42:13 2010 +0100
@@ -126,6 +126,9 @@
}, {
title: OB.I18N.getLabel('OBKMO_WMO_DeleteThisWidget'),
widget: this.widget,
+ enableIf: function (target, menu, item){
+ return this.widget.canDelete;
+ },
click: function (target, item, menu){
this.widget.closeClick();
}
@@ -168,6 +171,7 @@
showCloseButton: false,
closeConfirmationMessage:
OB.I18N.getLabel('OBKMO_DeleteThisWidgetConfirmation'),
+ canDelete: true,
dbInstanceId: '',
// Parameters handling
diff -r 7191314bb53e -r 15f23ade6a08
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-view.js
---
a/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-view.js
Thu Dec 30 14:13:36 2010 +0100
+++
b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-view.js
Thu Dec 30 17:42:13 2010 +0100
@@ -26,6 +26,7 @@
widgetInstanceId: null,
fields: null,
gridDataSource: null,
+ widgetId: null,
//Set PortalLayout common parameters
numColumns: 1,
@@ -38,14 +39,20 @@
this.widgetInstanceId = args.widgetInstanceId;
this.fields = args.fields;
this.gridDataSource = args.gridDataSource;
+ this.widgetId = args.widgetId;
- var widgetInstance = isc.OBQueryListWidget.create(isc.addProperties({
+ var widgetInstance = isc['_'+this.widgetId].create(isc.addProperties({
viewMode: 'maximized',
fields: this.fields,
widgetInstanceId: this.widgetInstanceId,
+ widgetId: this.widgetId,
dbInstanceId: this.widgetInstanceId,
gridDataSource: this.gridDataSource,
- title: args.tabTitle
+ title: args.tabTitle,
+ menuItems: args.menuItems,
+ parameters: args.parameters,
+ fieldDefinitions: args.fieldDefinitions,
+ canDelete: false
}));
this.addPortlet(widgetInstance);
},
diff -r 7191314bb53e -r 15f23ade6a08
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 Dec 30 14:13:36 2010 +0100
+++
b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
Thu Dec 30 17:42:13 2010 +0100
@@ -86,7 +86,9 @@
},
refresh: function(){
- this.setWidgetHeight();
+ if (this.viewMode === 'widget') {
+ this.setWidgetHeight();
+ }
this.grid.invalidateCache();
this.grid.filterData();
},
@@ -112,8 +114,12 @@
OB.Layout.ViewManager.openView('OBQueryListView', {
tabTitle: this.title,
widgetInstanceId: this.dbInstanceId,
+ widgetId: this.widgetId,
fields: this.maximizedFields,
- gridDataSource: this.gridDataSource
+ gridDataSource: this.gridDataSource,
+ parameters: this.parameters,
+ menuItems: this.menuItems,
+ fieldDefinitions: this.fieldDefinitions
});
}
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
