From 7d6ca994b88be8b3482855f2196d0b343ea91a13 Mon Sep 17 00:00:00 2001 From: Carlos Roca Date: Mon, 6 Mar 2023 16:41:23 +0100 Subject: [PATCH 1/2] [FIX] pre-commit CI FIX --- .copier-answers.yml | 3 ++- .github/workflows/pre-commit.yml | 2 +- .github/workflows/test.yml | 2 +- .pre-commit-config.yaml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 2710b0e0d..d3e0b35e5 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,10 +1,11 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.12.0 +_commit: v1.14.2 _src_path: gh:oca/oca-addons-repo-template ci: GitHub dependency_installation_mode: PIP generate_requirements_txt: true github_check_license: true +github_ci_extra_env: {} github_enable_codecov: true github_enable_makepot: true github_enable_stale_action: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index c05220662..5cdd68ed3 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -11,7 +11,7 @@ on: jobs: pre-commit: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2500f55a7..d301a5668 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: fi done test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: ${{ matrix.container }} name: ${{ matrix.name }} strategy: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1903f5c4c..988051bfe 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -101,7 +101,7 @@ repos: - id: pyupgrade args: ["--keep-percent-format"] - repo: https://github.com/PyCQA/isort - rev: 5.5.1 + rev: 5.12.0 hooks: - id: isort name: isort except __init__.py From 7ebcfa1d112c4cd1910e18f3cc7c20a89b231d90 Mon Sep 17 00:00:00 2001 From: Carlos Roca Date: Mon, 6 Mar 2023 16:42:13 +0100 Subject: [PATCH 2/2] [FIX] web_timeline: css and styles not charged when rendering timeline On library version update a new feature was added at Timeline creation level to allow modifying the xss. By keeping it active the css classes are not showed As the view is on backend, has no sense to keep it active. So we deactivate the feature to allow show the timeline correctly. TT40299 --- web_timeline/static/src/js/timeline_renderer.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web_timeline/static/src/js/timeline_renderer.js b/web_timeline/static/src/js/timeline_renderer.js index 0cf378eca..fa1435685 100644 --- a/web_timeline/static/src/js/timeline_renderer.js +++ b/web_timeline/static/src/js/timeline_renderer.js @@ -227,7 +227,11 @@ odoo.define("web_timeline.TimelineRenderer", function (require) { this.qweb.add_template(tmpl); } - this.timeline = new vis.Timeline(this.$timeline.get(0)); + this.timeline = new vis.Timeline( + this.$timeline.get(0), + {}, + {xss: {disabled: true}} + ); this.timeline.setOptions(this.options); if (this.mode && this["on_scale_" + this.mode + "_clicked"]) { this["on_scale_" + this.mode + "_clicked"]();