details: https://code.openbravo.com/erp/devel/pi/rev/c3d7071d4d69
changeset: 13856:c3d7071d4d69
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Sep 28 16:48:16 2011 +0200
summary: Related to issue 18587: Changes/improvement saved and named views
Moved check on prof edition to utility
Moved styling info to styling js
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
| 13 +-----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
| 9 +---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
| 20
++++++++++
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js
| 3 +
4 files changed, 29 insertions(+), 16 deletions(-)
diffs (99 lines):
diff -r be2d028b01bc -r c3d7071d4d69
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
Wed Sep 28 16:36:34 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
Wed Sep 28 16:48:16 2011 +0200
@@ -26,9 +26,6 @@
initWidget: function() {
this.menu = isc.Menu.create({
button: this,
-
- iconHeight: 8,
- iconWidth: 4,
// overridden to get much simpler custom style name
getBaseStyle: function(record, rowNum, colNum){
@@ -61,12 +58,8 @@
views = personalization && personalization.views ?
personalization.views : [],
canDelete = false;
- if(OB.Application.licenseType === 'C') {
- isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage',
[OB.I18N.getLabel('OBUIAPP_ActivateMessagePersonalization')]), {
- isModal: true,
- showModalMask: true,
- toolbarButtons: [isc.Dialog.OK]
- });
+ if (!OB.Utilities.checkProfessionalLicense(
+ OB.I18N.getLabel('OBUIAPP_ActivateMessagePersonalization'))) {
return;
}
@@ -77,7 +70,7 @@
canDelete = view.canEdit || canDelete;
if (standardWindow.selectedPersonalizationId && view.personalizationId
=== standardWindow.selectedPersonalizationId) {
- icon = OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/personalization/iconSelectedView.png';
+ icon = this.menu.itemIcon;
} else {
icon = null;
}
diff -r be2d028b01bc -r c3d7071d4d69
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
Wed Sep 28 16:36:34 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
Wed Sep 28 16:48:16 2011 +0200
@@ -26,12 +26,9 @@
personalizationButtonProperties = {
action: function() {
- if(OB.Application.licenseType === 'C') {
- isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage',
[OB.I18N.getLabel('OBUIAPP_ActivateMessagePersonalization')]), {
- isModal: true,
- showModalMask: true,
- toolbarButtons: [isc.Dialog.OK]
- });
+
+ if (!OB.Utilities.checkProfessionalLicense(
+ OB.I18N.getLabel('OBUIAPP_ActivateMessagePersonalization'))) {
return;
}
diff -r be2d028b01bc -r c3d7071d4d69
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
Wed Sep 28 16:36:34 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
Wed Sep 28 16:48:16 2011 +0200
@@ -21,6 +21,26 @@
// are related to opening views, opening popups, displaying yes/no, etc.
OB.Utilities = {};
+//** {{{OB.Utilities.checkProfessionalLicense}}} **
+// Checks if the current instance is using a professional license
+// (!= community). If the instance has a community instance then
+// a popup message is shown and false is returned.
+// The parameter can be used to add a custom message to the popup.
+OB.Utilities.checkProfessionalLicense = function(msg) {
+ if(OB.Application.licenseType === 'C') {
+ if (!msg) {
+ msg = '';
+ }
+ isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage', [msg]), {
+ isModal: true,
+ showModalMask: true,
+ toolbarButtons: [isc.Dialog.OK]
+ });
+ return false;
+ }
+ return true;
+};
+
// ** {{{OB.Utilities.truncTitle}}} **
// Truncs a string after a specific length. Initial implementation is
// simple (just cuts of at the specified length). Returns the trunced title
diff -r be2d028b01bc -r c3d7071d4d69
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js
Wed Sep 28 16:36:34 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js
Wed Sep 28 16:48:16 2011 +0200
@@ -41,6 +41,9 @@
bodyStyleName: 'OBPersonalizationPullDownMenuBody',
tableStyle: "OBPersonalizationPullDownMenuTable",
iconBodyStyleName: 'OBPersonalizationPullDownMenuBody',
+ iconWidth: 4,
+ iconHeight: 8,
+ itemIcon: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/personalization/iconSelectedView.png',
bodyBackgroundColor: null
};
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
