From 08d06d2b0631f4ab1864167c6fc728d43e1852da Mon Sep 17 00:00:00 2001 From: Invitu Date: Mon, 17 Dec 2018 23:10:48 -1000 Subject: [PATCH] [IMP] Add stack support --- web_timeline/README.rst | 2 ++ web_timeline/__manifest__.py | 2 +- web_timeline/static/src/js/timeline_view.js | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web_timeline/README.rst b/web_timeline/README.rst index 5881f732..eaaf4eef 100755 --- a/web_timeline/README.rst +++ b/web_timeline/README.rst @@ -58,6 +58,8 @@ the possible attributes for the tag: +--------------------+-----------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | event_open_popup | No | When set to true, it allows to edit the events in a popup. If not (default value), the record is edited changing to form view. | +--------------------+-----------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| stack | No | When set to false, items will not be stacked on top of each other such that they do overlap. | ++--------------------+-----------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | colors | No | Allows to set certain specific colors if the expressed condition (JS syntax) is met. | +--------------------+-----------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | dependency_arrow | No | Set this attribute to a x2many field to draw arrows between the records referenced in the x2many field. | diff --git a/web_timeline/__manifest__.py b/web_timeline/__manifest__.py index a376e093..302c6d2b 100644 --- a/web_timeline/__manifest__.py +++ b/web_timeline/__manifest__.py @@ -4,7 +4,7 @@ { 'name': "Web timeline", 'summary': "Interactive visualization chart to show events in time", - "version": "12.0.1.0.0", + "version": "12.0.1.0.1", "development_status": "Production/Stable", 'author': 'ACSONE SA/NV, ' 'Tecnativa, ' diff --git a/web_timeline/static/src/js/timeline_view.js b/web_timeline/static/src/js/timeline_view.js index 99564324..d61afa3c 100644 --- a/web_timeline/static/src/js/timeline_view.js +++ b/web_timeline/static/src/js/timeline_view.js @@ -111,12 +111,17 @@ odoo.define('web_timeline.TimelineView', function (require) { if (!isNullOrUndef(attrs.quick_create_instance)) { self.quick_create_instance = 'instance.' + attrs.quick_create_instance; } + this.stack = true; + if (!isNullOrUndef(attrs.stack) && !_.str.toBoolElse(attrs.stack, "true")) { + this.stack = false; + } this.options = { groupOrder: this.group_order, orientation: 'both', selectable: true, multiselect: true, showCurrentTime: true, + stack: this.stack, zoomKey: this.zoomKey }; if (isNullOrUndef(attrs.event_open_popup) || !_.str.toBoolElse(attrs.event_open_popup, true)) {