details: https://code.openbravo.com/erp/devel/main/rev/dcfb9d2d53a3 changeset: 14186:dcfb9d2d53a3 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Nov 04 06:44:35 2011 +0100 summary: Fixes issue 18963: Short flash of all orange process buttons when selecting a record
details: https://code.openbravo.com/erp/devel/main/rev/076b2132dd00 changeset: 14187:076b2132dd00 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Nov 04 06:54:22 2011 +0100 summary: Fixes issue 18962: Filter funnel icon does not appear when you use an "or" clause details: https://code.openbravo.com/erp/devel/main/rev/6989fea2297b changeset: 14188:6989fea2297b user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Nov 04 07:33:29 2011 +0100 summary: Related to issue 18667: Provide a reset-to-defaults for Personalized Forms details: https://code.openbravo.com/erp/devel/main/rev/394c05cf5653 changeset: 14189:394c05cf5653 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Nov 04 13:34:40 2011 +0100 summary: Fixes issue 18667: Provide a reset-to-defaults for Personalized Forms details: https://code.openbravo.com/erp/devel/main/rev/a6b30f6b8e49 changeset: 14190:a6b30f6b8e49 user: Martin Taal <martin.taal <at> openbravo.com> date: Sat Nov 05 23:21:18 2011 +0100 summary: Fixes issue 18980: Odd button show/hide behaviour generates error in Automated Tests Related to issue 18963: Short flash of all orange process buttons when selecting a record details: https://code.openbravo.com/erp/devel/main/rev/d644e677acda changeset: 14191:d644e677acda user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Nov 08 13:25:13 2011 +0100 summary: Fixes issue 18667: Provide a reset-to-defaults for Personalized Forms details: https://code.openbravo.com/erp/devel/main/rev/8a364ab2536c changeset: 14192:8a364ab2536c user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Nov 08 15:28:58 2011 +0100 summary: Fixes issue 19017: Wrong toolbar buttons are displayed and having unsaved changed to a previously saved record. diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 9 +++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js | 18 +++++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js | 21 ++++++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 18 ++++++-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 11 ++-- 8 files changed, 68 insertions(+), 29 deletions(-) diffs (244 lines): diff -r fb551a9dc2af -r 8a364ab2536c 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 Fri Nov 04 01:40:05 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Tue Nov 08 15:28:58 2011 +0100 @@ -519,6 +519,17 @@ <!--ABFDBB83F58841EA9545D9ED8637513B--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--ABFDBB83F58841EA9545D9ED8637513B--></AD_MESSAGE> +<!--AD6549B710194782BAB683B1DB839E49--><AD_MESSAGE> +<!--AD6549B710194782BAB683B1DB839E49--> <AD_MESSAGE_ID><![CDATA[AD6549B710194782BAB683B1DB839E49]]></AD_MESSAGE_ID> +<!--AD6549B710194782BAB683B1DB839E49--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--AD6549B710194782BAB683B1DB839E49--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--AD6549B710194782BAB683B1DB839E49--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--AD6549B710194782BAB683B1DB839E49--> <VALUE><![CDATA[OBUIAPP_StandardView]]></VALUE> +<!--AD6549B710194782BAB683B1DB839E49--> <MSGTEXT><![CDATA[Standard View]]></MSGTEXT> +<!--AD6549B710194782BAB683B1DB839E49--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--AD6549B710194782BAB683B1DB839E49--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--AD6549B710194782BAB683B1DB839E49--></AD_MESSAGE> + <!--B05C4EF1C8624EAAAC53764B7DACB2C2--><AD_MESSAGE> <!--B05C4EF1C8624EAAAC53764B7DACB2C2--> <AD_MESSAGE_ID><![CDATA[B05C4EF1C8624EAAAC53764B7DACB2C2]]></AD_MESSAGE_ID> <!--B05C4EF1C8624EAAAC53764B7DACB2C2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r fb551a9dc2af -r 8a364ab2536c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Fri Nov 04 01:40:05 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Tue Nov 08 15:28:58 2011 +0100 @@ -514,12 +514,14 @@ } var field = this.filterEditor.getField(prop); - if (this.isValidFilterField(field) && (value === false || value || value === 0)) { + // criterion.operator is set in case of an and/or expression + if (this.isValidFilterField(field) && (criterion.operator || value === false || value || value === 0)) { return true; } field = this.filterEditor.getField(fullPropName); - if (this.isValidFilterField(field) && (value === false || value || value === 0)) { + // criterion.operator is set in case of an and/or expression + if (this.isValidFilterField(field) && (criterion.operator || value === false || value || value === 0)) { return true; } } diff -r fb551a9dc2af -r 8a364ab2536c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Fri Nov 04 01:40:05 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Tue Nov 08 15:28:58 2011 +0100 @@ -1067,6 +1067,9 @@ this.updateLastSelectedState(); this.updateTabTitle(); + + // commented line because of https://issues.openbravo.com/view.php?id=18963 + // toolbar seems to be refreshed in any case // note only set session info if there is a record selected this.toolBar.updateButtonState(!selectedRecordId || this.isEditingGrid || this.isShowingForm); diff -r fb551a9dc2af -r 8a364ab2536c 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 Fri Nov 04 01:40:05 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js Tue Nov 08 15:28:58 2011 +0100 @@ -133,7 +133,14 @@ // cache the original view so that it can be restored if (!this.getClass().originalView) { - this.getClass().originalView = OB.Personalization.getViewDefinition(this, '', false); + this.getClass().originalView = {}; + this.getClass().originalView.personalizationId = 'dummyId'; + this.getClass().originalView.viewDefinition = OB.Personalization.getViewDefinition(this, '', false); + this.getClass().originalView.viewDefinition.name = OB.I18N.getLabel('OBUIAPP_StandardView'); + this.getClass().originalView.canDelete = false; + + // and clone the original view so that it can't get updated accidentally + this.getClass().originalView = isc.clone(this.getClass().originalView); } this.getClass().personalization = personalization; diff -r fb551a9dc2af -r 8a364ab2536c 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 Fri Nov 04 01:40:05 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js Tue Nov 08 15:28:58 2011 +0100 @@ -61,7 +61,7 @@ action: function() { var data = [], icon, i, undef, view, formData, standardWindow = this.view.standardWindow, - adminLevel = false, length, + adminLevel = false, length, viewSelected = false, personalization = standardWindow.getClass().personalization, views = personalization && personalization.views ? personalization.views : [], canDelete = false; @@ -71,6 +71,15 @@ return; } + // add the standard view, but make a copy so that it is not added + // to the real list of editable/deletable views + views = isc.shallowClone(views); + views.push(standardWindow.getClass().originalView); + + if (!standardWindow.selectedPersonalizationId) { + standardWindow.selectedPersonalizationId = standardWindow.getClass().originalView.personalizationId; + } + // create the list of current views to show length = views.length; for (i = 0; i < length; i++) { @@ -78,7 +87,7 @@ canDelete = view.canEdit || canDelete; if (standardWindow.selectedPersonalizationId && view.personalizationId === standardWindow.selectedPersonalizationId) { - icon = this.menu.itemIcon; + icon = this.menu.itemIcon; } else { icon = null; } @@ -140,11 +149,6 @@ popup.show(); }}); } - - data.push({title: OB.I18N.getLabel('OBUIAPP_RestoreDefaults'), - doClick: function(standardWindow) { - OB.Personalization.applyViewDefinition('', standardWindow.getClass().originalView, standardWindow); - }}); } if (data.length === 0) { diff -r fb551a9dc2af -r 8a364ab2536c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js Fri Nov 04 01:40:05 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js Tue Nov 08 15:28:58 2011 +0100 @@ -59,7 +59,7 @@ ], initWidget: function() { - var nodes, i; + var i; // todo: show custom items for different types of fields this.nodeIcon = OB.Styles.Personalization.Icons.field; this.folderIcon = OB.Styles.Personalization.Icons.fieldGroup; @@ -110,13 +110,18 @@ // this.data.openAll(); this.Super('initWidget', arguments); - - // open the folders which need to be opened - for (i = 0, nodes = this.data.getAllNodes(); i < nodes.length; i++) { - if (nodes[i].sectionExpanded) { - this.openFolder(nodes[i]); - } - } + }, + + // open the folders and expands form items, needs to be called + // after the preview form has been build + openFolders: function() { + var i, nodes; + // open the folders which need to be opened + for (i = 0, nodes = this.data.getAllNodes(); i < nodes.length; i++) { + if (nodes[i].sectionExpanded) { + this.openFolder(nodes[i]); + } + } }, destroy: function() { diff -r fb551a9dc2af -r 8a364ab2536c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js Fri Nov 04 01:40:05 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js Tue Nov 08 15:28:58 2011 +0100 @@ -550,12 +550,15 @@ restoreButtonProperties = { action: function() { var i, standardWindow = this.view.getStandardWindow(), - viewDefinitions = standardWindow.getClass().originalView, + viewDefinitions = standardWindow.getClass().originalView.viewDefinition, length = standardWindow.views.length, view, viewTabDefinition; for (i = 0; i < length; i++) { view = standardWindow.views[i]; + if (view.tabId !== this.view.tabId) { + continue; + } viewTabDefinition = viewDefinitions[view.tabId]; - + this.view.initializing = true; this.view.destroyAndRemoveMembers(this.view.mainLayout); @@ -564,7 +567,10 @@ this.view.buildFieldsTreeGrid(viewTabDefinition); this.view.buildPreviewForm(); - delete this.initializing; + this.view.fieldsTreeGrid.openFolders(); + + delete this.view.initializing; + this.view.changed(); } }, title: OB.I18N.getLabel('OBUIAPP_RestoreDefaults'), @@ -737,11 +743,12 @@ this.destroyAndRemoveMembers(this.mainLayout); this.mainLayout = null; this.createAddMainLayout(); - - this.setStatusBarInformation(); this.buildFieldsTreeGrid(); this.buildPreviewForm(); + this.setStatusBarInformation(); + this.fieldsTreeGrid.openFolders(); + delete this.initializing; }, @@ -915,6 +922,7 @@ this.buildFieldsTreeGrid(); this.setStatusBarInformation(); + this.fieldsTreeGrid.openFolders(); }, buildFieldsTreeGrid: function(personalizationData) { diff -r fb551a9dc2af -r 8a364ab2536c 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 Fri Nov 04 01:40:05 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js Tue Nov 08 15:28:58 2011 +0100 @@ -1109,8 +1109,6 @@ } if (hideAllButtons) { this.hideShowRightMembers(false); - } else { - this.hideShowRightMembers(true); } var noneOrMultipleRecordsSelected = currentContext.viewGrid.getSelectedRecords().length !== 1 && !isNew; @@ -1177,10 +1175,11 @@ hideShowRightMembers: function(show) { var i; - for (i = 0; i < this.rightMembers.length; i++) { - if (show) { - this.rightMembers[i].show(); - } else { + // if showing make sure that they are not always shown + if (show) { + this.refreshCustomButtons(false); + } else { + for (i = 0; i < this.rightMembers.length; i++) { this.rightMembers[i].hide(); } } ------------------------------------------------------------------------------ RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
