Skip to content
Snippets Groups Projects
Commit 1f600826 authored by qsm-odoo's avatar qsm-odoo
Browse files

[FIX] survey: fix assets forward-port

For saas-12.2 a file was added in survey assets with
https://github.com/odoo/odoo/commit/445541989f9dc094bf81201a715abe0a68ed1c63
(even though the file itself was added in the repo with
https://github.com/odoo/odoo/commit/afb1abbb60e5cdc4f76ab7b5a1b54b5e8a9283d5)

As a saas-12.1 fix, this was made:
https://github.com/odoo/odoo/commit/92cb648882082cc8d84d3bbe75304def5196998c


That fix split the survey assets in two parts. After forward-port, the
file added in saas-12.2 ended up in the wrong part.

Bug found while working on task-1961045

closes odoo/odoo#33821

Signed-off-by: default avatarQuentin Smetz (qsm) <qsm@odoo.com>
parent 494a2b26
Branches
Tags
No related merge requests found
......@@ -18,6 +18,7 @@
<link href="/web/static/lib/nvd3/nv.d3.css" rel="stylesheet" type="text/css"></link>
<link href="/survey/static/src/css/survey_print.css" rel="stylesheet" type="text/css"/>
<link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
<link rel="stylesheet" type="text/scss" href="/survey/static/src/scss/survey_templates.scss"/>
</template>
<template id="survey_web_assets" name="Survey Web Assets">
......@@ -31,7 +32,6 @@
<link rel="stylesheet" type="text/less" href="/web/static/src/scss/fonts.scss" />
<!-- Some helper classes (like mt- mb-) are required for survey templates -->
<link rel="stylesheet" type="text/less" href="/web_editor/static/src/scss/web_editor.common.scss"/>
<link rel="stylesheet" type="text/scss" href="/survey/static/src/scss/survey_templates.scss"/>
</template>
<template id="survey_report_assets_pdf" inherit_id="web.report_assets_pdf">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment