Merge PR #2429 into 14.0

Signed-off-by pedrobaeza
pull/2444/head
OCA-git-bot 2023-03-06 15:52:13 +00:00
commit ea0b6153a1
5 changed files with 10 additions and 5 deletions

View File

@ -1,10 +1,11 @@
# Do NOT update manually; changes here will be overwritten by Copier # 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 _src_path: gh:oca/oca-addons-repo-template
ci: GitHub ci: GitHub
dependency_installation_mode: PIP dependency_installation_mode: PIP
generate_requirements_txt: true generate_requirements_txt: true
github_check_license: true github_check_license: true
github_ci_extra_env: {}
github_enable_codecov: true github_enable_codecov: true
github_enable_makepot: true github_enable_makepot: true
github_enable_stale_action: true github_enable_stale_action: true

View File

@ -11,7 +11,7 @@ on:
jobs: jobs:
pre-commit: pre-commit:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4

View File

@ -28,7 +28,7 @@ jobs:
fi fi
done done
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
container: ${{ matrix.container }} container: ${{ matrix.container }}
name: ${{ matrix.name }} name: ${{ matrix.name }}
strategy: strategy:

View File

@ -101,7 +101,7 @@ repos:
- id: pyupgrade - id: pyupgrade
args: ["--keep-percent-format"] args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort - repo: https://github.com/PyCQA/isort
rev: 5.5.1 rev: 5.12.0
hooks: hooks:
- id: isort - id: isort
name: isort except __init__.py name: isort except __init__.py

View File

@ -227,7 +227,11 @@ odoo.define("web_timeline.TimelineRenderer", function (require) {
this.qweb.add_template(tmpl); 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); this.timeline.setOptions(this.options);
if (this.mode && this["on_scale_" + this.mode + "_clicked"]) { if (this.mode && this["on_scale_" + this.mode + "_clicked"]) {
this["on_scale_" + this.mode + "_clicked"](); this["on_scale_" + this.mode + "_clicked"]();