details: https://code.openbravo.com/erp/devel/pi/rev/66ca6b839efc changeset: 13853:66ca6b839efc user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Sep 28 11:39:47 2011 +0200 summary: Updated to SC 27-09-2011
details: https://code.openbravo.com/erp/devel/pi/rev/4247a7eb8792 changeset: 13854:4247a7eb8792 user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Sep 28 11:41:42 2011 +0200 summary: Related to 18587: Changes/improvement saved and named views Mainly styling changes, some logic changes to show selected view diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 17 ++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 15 ++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js | 30 ++++++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js | 31 ++++++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/personalization/iconSelectedView.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css | 3 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.css | 29 ++++++++- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js | 10 +++ modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 10 files changed, 113 insertions(+), 33 deletions(-) diffs (truncated from 397 to 300 lines): diff -r a84388fda4d4 -r 4247a7eb8792 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Sep 28 11:40:43 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Sep 28 11:41:42 2011 +0200 @@ -3043,7 +3043,7 @@ <!--FF8081813216F38A01321742648D0013--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF8081813216F38A01321742648D0013--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF8081813216F38A01321742648D0013--> <VALUE><![CDATA[OBUIAPP_ManageViews_Toolbar_Button]]></VALUE> -<!--FF8081813216F38A01321742648D0013--> <MSGTEXT><![CDATA[Click to select a saved view or to save the current view state or delete an existing view.]]></MSGTEXT> +<!--FF8081813216F38A01321742648D0013--> <MSGTEXT><![CDATA[Save view]]></MSGTEXT> <!--FF8081813216F38A01321742648D0013--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF8081813216F38A01321742648D0013--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--FF8081813216F38A01321742648D0013--></AD_MESSAGE> @@ -3121,10 +3121,21 @@ <!--FF80818132443EBA0132444357CE0011--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF80818132443EBA0132444357CE0011--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF80818132443EBA0132444357CE0011--> <VALUE><![CDATA[OBUIAPP_DefaultView]]></VALUE> -<!--FF80818132443EBA0132444357CE0011--> <MSGTEXT><![CDATA[Default View]]></MSGTEXT> -<!--FF80818132443EBA0132444357CE0011--> <MSGTIP><![CDATA[Default View]]></MSGTIP> +<!--FF80818132443EBA0132444357CE0011--> <MSGTEXT><![CDATA[Set as Default]]></MSGTEXT> +<!--FF80818132443EBA0132444357CE0011--> <MSGTIP><![CDATA[Set as Default]]></MSGTIP> <!--FF80818132443EBA0132444357CE0011--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF80818132443EBA0132444357CE0011--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--FF80818132443EBA0132444357CE0011--></AD_MESSAGE> +<!--FF80818132AE40480132AED3676C0126--><AD_MESSAGE> +<!--FF80818132AE40480132AED3676C0126--> <AD_MESSAGE_ID><![CDATA[FF80818132AE40480132AED3676C0126]]></AD_MESSAGE_ID> +<!--FF80818132AE40480132AED3676C0126--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF80818132AE40480132AED3676C0126--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF80818132AE40480132AED3676C0126--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF80818132AE40480132AED3676C0126--> <VALUE><![CDATA[OBUIAPP_SaveAs]]></VALUE> +<!--FF80818132AE40480132AED3676C0126--> <MSGTEXT><![CDATA[Save as]]></MSGTEXT> +<!--FF80818132AE40480132AED3676C0126--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--FF80818132AE40480132AED3676C0126--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--FF80818132AE40480132AED3676C0126--></AD_MESSAGE> + </data> diff -r a84388fda4d4 -r 4247a7eb8792 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js Wed Sep 28 11:40:43 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js Wed Sep 28 11:41:42 2011 +0200 @@ -142,7 +142,7 @@ // maybe do this in a separate thread if (defaultView) { this.fireOnPause('setDefaultView', function() { - OB.Personalization.applyViewDefinition(defaultView.viewDefinition, this); + OB.Personalization.applyViewDefinition(defaultView.personalizationId, defaultView.viewDefinition, this); }, 100); } @@ -184,7 +184,18 @@ }, getFormPersonalization: function(view) { - var formPersonalization; + var formPersonalization, i, persView; + if (this.getClass().personalization && this.getClass().personalization.views + && this.selectedPersonalizationId) { + for (i = 0; i < this.getClass().personalization.views.length; i++) { + persView = this.getClass().personalization.views[i]; + if (persView.viewDefinition && + persView.viewDefinition[view.tabId] && + persView.personalizationId === this.selectedPersonalizationId) { + return persView.viewDefinition[view.tabId].form; + } + } + } if (!this.getClass().personalization || !this.getClass().personalization.forms) { return null; } diff -r a84388fda4d4 -r 4247a7eb8792 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js Wed Sep 28 11:40:43 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js Wed Sep 28 11:41:42 2011 +0200 @@ -81,26 +81,33 @@ saveButton.setDisabled(!pers); } }, + + handleKeyPress: function(){ + var key = isc.EH.lastEvent.keyName; + if (key === 'Enter' && !this.saveButton.isDisabled()) { + this.saveButton.action(); + return false; + } else { + return this.Super('handleKeyPress', arguments); + } + }, + fields: this.getFields() }); saveButton.form = form; + form.saveButton = saveButton; // create some layouts to put the form/buttons // in the popup window layout = isc.VLayout.create({ defaultLayoutAlign: 'center', - membersMargin: 10, width: '100%', height: '100%' }); this.addItem(layout); - buttonsLayout = isc.HStack.create({ - width: '100%', - align: 'center', - overflow: 'visible', - height: 1 - }); + buttonsLayout = isc.HStack.create({}, + OB.Styles.Personalization.popupButtonLayout); buttonsLayout.addMembers(saveButton); buttonsLayout.addMembers(isc.OBFormButton.create({ title: OB.I18N.getLabel('UINAVBA_Cancel'), @@ -151,6 +158,7 @@ valueMap: valueMap, editorType: 'select', addUnknownValues: false, + required: true, allowEmptyValue: true }, OB.Styles.Personalization.viewFieldDefaults, @@ -166,7 +174,7 @@ return flds; }, - // do the delete action + // do the set default action doAction: function(form) { var personalizationId = form.getValue("personalization"); OB.PropertyStore.set('OBUIAPP_DefaultSavedView', personalizationId, this.standardWindow.windowId); @@ -248,7 +256,7 @@ flds[0] = isc.addProperties({ standardWindow: standardWindow, name: 'personalization', - title: OB.I18N.getLabel('OBUIAPP_View'), + title: OB.I18N.getLabel('OBUIAPP_SaveAs'), valueMap: valueMap, editorType: 'ComboBoxItem', allowEmptyValue: true, @@ -262,7 +270,7 @@ personalization = this.standardWindow.getClass().personalization, views; // find the personalization - if (personalization.views) { + if (levelField && personalization.views) { // and the view, and set the level and level value // combos views = personalization.views; @@ -323,6 +331,7 @@ valueMap: levelMap, editorType: 'select', defaultToFirstOption: true, + emptyDisplayValue: OB.I18N.getLabel('OBUIAPP_User'), changed: function (form, item, value) { // if the level combo changes, then set the // level value map (so that it shows clients, orgs @@ -341,6 +350,7 @@ title: OB.I18N.getLabel('OBUIAPP_Value'), valueMap: {}, editorType: 'select', + emptyDisplayValue: OB.User.userName, defaultToFirstOption: true }, OB.Styles.Personalization.viewFieldDefaults, diff -r a84388fda4d4 -r 4247a7eb8792 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 11:40:43 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js Wed Sep 28 11:41:42 2011 +0200 @@ -26,16 +26,24 @@ initWidget: function() { this.menu = isc.Menu.create({ button: this, - showIcons: false, + + iconHeight: 8, + iconWidth: 4, // overridden to get much simpler custom style name getBaseStyle: function(record, rowNum, colNum){ + if (colNum === 0) { + return this.baseStyle + 'Icon'; + } + if (record.showSeparator) { + return this.baseStyle + 'Separator'; + } return this.baseStyle; }, itemClick: function(item, colNum) { if (item.viewDefinition) { - OB.Personalization.applyViewDefinition(item.viewDefinition, this.button.view.standardWindow); + OB.Personalization.applyViewDefinition(item.personalizationId, item.viewDefinition, this.button.view.standardWindow); } else { item.doClick(this.button.view.standardWindow); } @@ -46,16 +54,14 @@ // shows the menu with the available views and the save // and delete option action: function() { - var data = [], i, undef, view, + var data = [], icon, i, undef, view, standardWindow = this.view.standardWindow, adminLevel = false, length, personalization = standardWindow.getClass().personalization, views = personalization && personalization.views ? personalization.views : [], canDelete = false; - // TODO: disabled license check to facilitate testing - if(OB.Application.licenseType === 'DUMMY') { -// if(OB.Application.licenseType === 'C') { + if(OB.Application.licenseType === 'C') { isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage', [OB.I18N.getLabel('OBUIAPP_ActivateMessagePersonalization')]), { isModal: true, showModalMask: true, @@ -69,15 +75,19 @@ for (i = 0; i < length; i++) { view = views[i]; canDelete = view.canEdit || canDelete; - data.push({title: view.viewDefinition.name, viewDefinition: view.viewDefinition}); + + if (standardWindow.selectedPersonalizationId && view.personalizationId === standardWindow.selectedPersonalizationId) { + icon = OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/personalization/iconSelectedView.png'; + } else { + icon = null; + } + + data.push({title: view.viewDefinition.name, icon: icon, personalizationId: view.personalizationId, viewDefinition: view.viewDefinition}); } // compute the menu items, only if the user is allowed // to personalize if (this.isWindowPersonalizationAllowed()) { - if (data.length > 0) { - data.push({isSeparator: true}); - } if (standardWindow.getClass().personalization && standardWindow.getClass().personalization.formData) { formData = standardWindow.getClass().personalization.formData; @@ -87,6 +97,7 @@ } data.push({title: OB.I18N.getLabel('OBUIAPP_SaveView'), + showSeparator: data.length > 0, doClick: function(standardWindow) { var popup = isc.OBPopup.create({ standardWindow: standardWindow diff -r a84388fda4d4 -r 4247a7eb8792 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js Wed Sep 28 11:40:43 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js Wed Sep 28 11:41:42 2011 +0200 @@ -98,7 +98,7 @@ // ** {{{OB.Personalization.applyViewDefinition}}} ** // Apply a selected view definition to a window -OB.Personalization.applyViewDefinition = function(viewDefinition, standardWindow) { +OB.Personalization.applyViewDefinition = function(persId, viewDefinition, standardWindow) { var i, view, viewTabDefinition, length = standardWindow.views.length, windowDefinition = viewDefinition.window; @@ -106,6 +106,8 @@ // as these will be overwritten by the new settings standardWindow.removeAllFormPersonalizations(); + standardWindow.selectedPersonalizationId = persId; + if (windowDefinition) { if (windowDefinition.activeTabId) { for (i = 0; i < length; i++) { @@ -237,6 +239,7 @@ personalization = standardWindow.getClass().personalization, views = personalization && personalization.views ? personalization.views : []; + standardWindow.selectedPersonalizationId = data.personalizationId; // create a new structure, the same way as it is // returned from the server @@ -284,7 +287,6 @@ }); } - isc.say(OB.I18N.getLabel('OBUIAPP_ViewHasBeenSaved', [personalizationData.name])); } ); }; @@ -315,7 +317,6 @@ } } } - isc.say(OB.I18N.getLabel('OBUIAPP_ViewHasBeenDeleted')); } ); }; diff -r a84388fda4d4 -r 4247a7eb8792 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/personalization/iconSelectedView.png Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/personalization/iconSelectedView.png has changed diff -r a84388fda4d4 -r 4247a7eb8792 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css --- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css Wed Sep 28 11:40:43 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css Wed Sep 28 11:41:42 2011 +0200 @@ -358,7 +358,8 @@ // workaround for this issue: // https://issues.openbravo.com/view.php?id=18501 -.pickListMenuBody { +.pickListMenuBody, ------------------------------------------------------------------------------ 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
