diff options
| author | Julien Mougenot <jum@odoo.com> | 2020-04-09 12:50:23 +0000 |
|---|---|---|
| committer | Julien Mougenot <jum@odoo.com> | 2020-04-09 14:59:54 +0000 |
| commit | ed38c2adb85a7cb62fda4c2db21a3cad9d84a420 (patch) | |
| tree | 786ddd5a4b87dbc21e0ae9ac42ec2868c793e2dd /addons/web/views/webclient_templates.xml | |
| parent | 26570b0701cf2d184b6f36bdd8885587f7939c9d (diff) | |
[FIX] web: flatten t-call-assets in test assets bundle
Before this commit, the test assets were called with a `t-call-assets` and contained
themselves some other `t-call-assets` to the back-end assets. According to the current
specification, having nested `t-call-assets` will result in a compilation of the
lower levels regardless of the current debugging mode.
Now, the test bundles (desktop & mobile) have been arranged so that their `t-call-assets`
are all called on the same level.
closes odoo/odoo#49306
Related: odoo/enterprise#9797
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Diffstat (limited to 'addons/web/views/webclient_templates.xml')
| -rw-r--r-- | addons/web/views/webclient_templates.xml | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index e76049ddc6b..0a208699b9b 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -591,16 +591,8 @@ </t> </template> - <template id="web.css_tests_assets"> + <template id="web.tests_assets"> <link type="text/css" rel="stylesheet" href="/web/static/lib/daterangepicker/daterangepicker.css"/> - </template> - - <template id="web.js_tests_assets"> - <t t-call-assets="web.assets_common" t-js="false"/> - <t t-call-assets="web.assets_backend" t-js="false"/> - <t t-call-assets="web.assets_common" t-css="false"/> - <t t-call-assets="web.assets_backend" t-css="false"/> - <link type="text/css" rel="stylesheet" href="/web/static/lib/qunit/qunit-2.9.1.css"/> <script type="text/javascript" src="/web/static/lib/qunit/qunit-2.9.1.js"></script> <script type="text/javascript" src="/web/static/tests/helpers/qunit_config.js"></script> @@ -670,6 +662,13 @@ <t t-set="html_data" t-value="{'style': 'height: 100%;'}"/> <t t-set="title">Web Tests</t> <t t-set="head"> + <t t-call-assets="web.assets_common" t-js="false"/> + <t t-call-assets="web.assets_backend" t-js="false"/> + <t t-call-assets="web.assets_common" t-css="false"/> + <t t-call-assets="web.assets_backend" t-css="false"/> + + <t t-call-assets="web.tests_assets" t-js="false"/> + <t t-call-assets="web.tests_assets" t-css="false"/> <t t-call-assets="web.qunit_suite_tests" t-js="false"/> <t t-call-assets="web.qunit_suite_tests" t-css="false"/> </t> @@ -679,9 +678,6 @@ </template> <template id="web.qunit_suite_tests"> - <t t-call="web.css_tests_assets"/> - <t t-call="web.js_tests_assets"/> - <script type="text/javascript" src="/base/static/tests/base_settings_tests.js"></script> <script type="text/javascript" src="/web/static/tests/qweb_tests.js"></script> @@ -773,6 +769,13 @@ <t t-set="title">Web Mobile Tests</t> <t t-set="head"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/> + <t t-call-assets="web.assets_common" t-js="false"/> + <t t-call-assets="web.assets_backend" t-js="false"/> + <t t-call-assets="web.assets_common" t-css="false"/> + <t t-call-assets="web.assets_backend" t-css="false"/> + + <t t-call-assets="web.tests_assets" t-js="false"/> + <t t-call-assets="web.tests_assets" t-css="false"/> <t t-call-assets="web.qunit_mobile_suite_tests" t-js="false"/> <t t-call-assets="web.qunit_mobile_suite_tests" t-css="false"/> </t> @@ -782,7 +785,6 @@ </template> <template id="web.qunit_mobile_suite_tests"> - <t t-call="web.js_tests_assets"/> <script type="text/javascript" src="/web/static/lib/jquery.touchSwipe/jquery.touchSwipe.js"></script> <script type="text/javascript" src="/web/static/tests/fields/basic_fields_mobile_tests.js"></script> <script type="text/javascript" src="/web/static/tests/fields/relational_fields_mobile_tests.js"></script> |