From 9a941192ebd1cd1619799b2c3f0dc0c17d70ad57 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Mon, 21 Jun 2021 16:09:56 +0200 Subject: [PATCH] [MIG] web_view_calendar_list: Migration to 13.0 --- web_view_calendar_list/__manifest__.py | 6 +++--- .../static/src/js/calendar_list_renderer.js | 21 +++++++------------ .../static/src/js/calendar_list_view.js | 4 ++-- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/web_view_calendar_list/__manifest__.py b/web_view_calendar_list/__manifest__.py index bc2bc170e..6ebd9d975 100644 --- a/web_view_calendar_list/__manifest__.py +++ b/web_view_calendar_list/__manifest__.py @@ -5,10 +5,10 @@ "name": "Web View Calendar List", "summary": """ Show calendars as a List""", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "license": "AGPL-3", "author": "Creu Blanca,Odoo Community Association (OCA)", "website": "https://github.com/OCA/web", - "depends": ["web",], - "data": ["templates/assets.xml",], + "depends": ["web"], + "data": ["templates/assets.xml"], } diff --git a/web_view_calendar_list/static/src/js/calendar_list_renderer.js b/web_view_calendar_list/static/src/js/calendar_list_renderer.js index 16e82bab8..b4dc62874 100644 --- a/web_view_calendar_list/static/src/js/calendar_list_renderer.js +++ b/web_view_calendar_list/static/src/js/calendar_list_renderer.js @@ -34,7 +34,7 @@ odoo.define("web_view_calendar_list.CalendarListRenderer", function(require) { self.trigger_up("openEvent", event); self.$calendar.fullCalendar("unselect"); }, - select: function(target_date, end_date, event, _js_event, _view) { + select: function(target_date, end_date) { var data = {start: target_date, end: end_date}; if (self.state.context.default_name) { data.title = self.state.context.default_name; @@ -52,9 +52,9 @@ odoo.define("web_view_calendar_list.CalendarListRenderer", function(require) { var start = event.r_start || event.start; var end = event.r_end || event.end; var timeFormat = - _t.database.parameters.time_format.search("%H") != -1 - ? "HH:mm" - : "h:mma"; + _t.database.parameters.time_format.search("%H") == -1 + ? "h:mma" + : "HH:mm"; display_hour = start.format(timeFormat) + " - " + end.format(timeFormat); if (display_hour === "00:00 - 00:00") { @@ -64,8 +64,8 @@ odoo.define("web_view_calendar_list.CalendarListRenderer", function(require) { element.find(".fc-list-item-time").text(display_hour); }, // Dirty hack to ensure a correct first render - eventAfterAllRender: function() { - $(window).trigger("resize"); + windowResize: function() { + self._render(); }, viewRender: function(view) { // Compute mode from view.name which is either 'month', @@ -88,6 +88,7 @@ odoo.define("web_view_calendar_list.CalendarListRenderer", function(require) { }, height: "parent", unselectAuto: false, + isRTL: _t.database.parameters.direction === "rtl", locale: locale, /* Reset locale when fullcalendar has already been instanciated before now @@ -145,14 +146,6 @@ odoo.define("web_view_calendar_list.CalendarListRenderer", function(require) { $fc_view.scrollLeft(scrollPosition); - var fullWidth = this.state.fullWidth; - this.$(".o_calendar_sidebar_toggler") - .toggleClass("fa-close", !fullWidth) - .toggleClass("fa-chevron-left", fullWidth) - .attr("title", fullWidth ? _("Open Sidebar") : _("Close Sidebar")); - this.$sidebar_container.toggleClass("o_sidebar_hidden", fullWidth); - this.$sidebar.toggleClass("o_hidden", fullWidth); - this._renderFilters(); this.$calendar.appendTo("body"); if (scrollTop) { diff --git a/web_view_calendar_list/static/src/js/calendar_list_view.js b/web_view_calendar_list/static/src/js/calendar_list_view.js index 7d0a4c229..f92b2dd36 100644 --- a/web_view_calendar_list/static/src/js/calendar_list_view.js +++ b/web_view_calendar_list/static/src/js/calendar_list_view.js @@ -13,11 +13,11 @@ odoo.define("web_view_calendar_list.CalendarListView", function(require) { var CalendarListView = CalendarView.extend({ display_name: _lt("Calendar List"), icon: "fa-calendar-check-o", - config: { + config: _.extend(CalendarView.prototype.config, { Model: CalendarListModel, Controller: CalendarListController, Renderer: CalendarListRenderer, - }, + }), }); view_registry.add("calendar_list", CalendarListView);