From 234aa3928584fe1a83def860df1ae9d706b02ea3 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Fri, 7 Feb 2014 18:16:37 +0100 Subject: [PATCH 1/5] [FIX] Fix bug when an event with date_startand date_stop (and not datetime as calendar) have always 1 days in more. bzr revid: jke@openerp.com-20140207171637-j37cnt63cywstrtj --- addons/web_calendar/static/src/js/web_calendar.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index b283f8b5cb1..ef84f8a2784 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -492,11 +492,7 @@ openerp.web_calendar = function(instance) { all_day = this.all_day ? evt[this.all_day] : false, res_computed_text = '', the_title = '', - attendees = []; - - if (this.date_stop && this.fields[this.date_stop].type == 'date') { - date_stop.addDay(1); - } + attendees = []; if (this.info_fields) { var temp_ret = {}; From 0821af1af96c0ff59770a32c03b0bd5cdf960c39 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 10 Feb 2014 13:34:16 +0100 Subject: [PATCH 2/5] [FIX] close autocomplete listing on input Closing previously occured on search request (so that a user wouldn't be able to select "old" data on new search request), but ``search`` is only triggered after the search delay. Worked when delay was 0, with it being moved to 250 a user can get results matching the previous search instead of the current one. Trigger a closing of the current results list on any ``input`` event, which is when text is entered in any of the searchview's ``InputView``. bzr revid: xmo@openerp.com-20140210123416-cfc0x24bfkiv4lse --- addons/web/static/src/js/search.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index fa9bae9969d..903a9f4683e 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -473,12 +473,9 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea * Sets up search view's view-wide auto-completion widget */ setup_global_completion: function () { - var self = this; - var autocomplete = this.$el.autocomplete({ source: this.proxy('complete_global_search'), select: this.proxy('select_completion'), - search: function () { self.$el.autocomplete('close'); }, focus: function (e) { e.preventDefault(); }, html: true, autoFocus: true, @@ -486,6 +483,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea delay: 250, }).data('autocomplete'); + this.$el.on('input', function () { + this.$el.autocomplete('close'); + }.bind(this)); + // MonkeyPatch autocomplete instance _.extend(autocomplete, { _renderItem: function (ul, item) { From e95eb140a74487a91a4c657c3616e4ceb10ea9b4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 10 Feb 2014 14:05:04 +0100 Subject: [PATCH 3/5] [CHG] website: fp wants image 'change' buttons to be btn-sm bzr revid: xmo@openerp.com-20140210130504-hejvay436emh7f36 --- addons/website/static/src/js/website.editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 1e8246366a9..7e867dca685 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -638,7 +638,7 @@ image_dialog(editor, new CKEDITOR.dom.element(previous)); $image_button.hide(); previous = null; - }); + }, 'btn-sm'); // previous is the state of the button-trigger: it's the // currently-ish hovered element which can trigger a button showing. From d4c7de4b03c7f21f79bdad97ff4475e367572c61 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 10 Feb 2014 14:28:55 +0100 Subject: [PATCH 4/5] [FIX] work around distribute_branding distribute_branding is applied after view inheritance is applied, and does not take it in account. As a result, altering an existing view "from the top" (e.g. adding a div element preceding an existing div) will alter the xpath leading to whatever element we need to deal with. Move fakebar injection to the bottom of the body, where it can't have any impact on preceding node paths. bzr revid: xmo@openerp.com-20140210132855-lwh1ow1tq1e0pidp --- addons/website/views/website_templates.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index bf61f64a1b9..9073ccb7a4a 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -224,7 +224,7 @@ padding-top: 51px; - +