diff options
| author | Aurélien Warnon <awa@odoo.com> | 2019-12-16 12:42:27 +0000 |
|---|---|---|
| committer | Aurélien Warnon <awa@odoo.com> | 2020-01-31 14:25:41 +0000 |
| commit | f3f1af710dd0e7c4864a02c5b1f0d5e57ea40d1b (patch) | |
| tree | 1f006a0d17d7c4feadc6dc4517ed9d2a9cb6801c /addons | |
| parent | a713f217fe5bee1f21c2f0828475d30600099659 (diff) | |
[REF] bus,website_livechat: import bus frontend assets in bus instead of website_livechat
This commit moves the import of bus JS files in the frontend assets from
website_livechat to the bus module itself.
This is done in preparation of the "survey live mode" feature that will also
require the bus files in the frontend context.
PR #43568
Task 1972640
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/bus/views/bus.xml | 8 | ||||
| -rw-r--r-- | addons/website_livechat/views/website_livechat.xml | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/addons/bus/views/bus.xml b/addons/bus/views/bus.xml index 4d8f7bc36de..8ccabfdfa3c 100644 --- a/addons/bus/views/bus.xml +++ b/addons/bus/views/bus.xml @@ -8,6 +8,14 @@ </xpath> </template> + <template id="assets_frontend" name="im assets" inherit_id="web.assets_frontend"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/bus/static/src/js/longpolling_bus.js"></script> + <script type="text/javascript" src="/bus/static/src/js/crosstab_bus.js"></script> + <script type="text/javascript" src="/bus/static/src/js/services/bus_service.js"></script> + </xpath> + </template> + <template id="qunit_suite" name="bus tests" inherit_id="web.qunit_suite"> <xpath expr="//script[last()]" position="after"> <script type="text/javascript" src="/bus/static/tests/bus_tests.js"/> diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml index 4f2f36fdc8b..a6f0796d01c 100644 --- a/addons/website_livechat/views/website_livechat.xml +++ b/addons/website_livechat/views/website_livechat.xml @@ -20,10 +20,6 @@ <script type="text/javascript" src="/mail/static/src/js/thread_windows/abstract_thread_window.js"></script> <script type="text/javascript" src="/im_livechat/static/src/js/website_livechat_window.js"></script> - <script type="text/javascript" src="/bus/static/src/js/longpolling_bus.js"></script> - <script type="text/javascript" src="/bus/static/src/js/crosstab_bus.js"></script> - <script type="text/javascript" src="/bus/static/src/js/services/bus_service.js"></script> - <script type="text/javascript" src="/mail/static/src/js/document_viewer.js"></script> <script type="text/javascript" src="/mail/static/src/js/thread_widget.js"></script> <script type="text/javascript" src="/mail/static/src/js/utils.js"></script> |