diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-03-28 18:05:31 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-03-28 18:05:31 +0200 |
| commit | 2df5faa551112d0bde9c30a8e6f0536fb7bf21d3 (patch) | |
| tree | e0b09fe7efc2f983075ba742aed97daa5245dd39 /addons/report/static/src | |
| parent | ad811b19a0b88366cfe2cd28c2cd871d27107408 (diff) | |
| parent | 2f68e9e93a11f37241c1be2835e74ff8be95db1d (diff) | |
[MERGE] forward port branch saas-14 up to 2f68e9e93a1
Diffstat (limited to 'addons/report/static/src')
| -rw-r--r-- | addons/report/static/src/js/report.editor.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/report/static/src/js/report.editor.js b/addons/report/static/src/js/report.editor.js index 5b58793bbf5..57942f9b79c 100644 --- a/addons/report/static/src/js/report.editor.js +++ b/addons/report/static/src/js/report.editor.js @@ -1,6 +1,8 @@ odoo.define('report.editor', function (require) { 'use strict'; +var ajax = require('web.ajax'); +var core = require('web.core'); var utils = require('report.utils'); var editor = require('web_editor.editor'); var options = require('web_editor.snippets.options'); @@ -10,6 +12,8 @@ var trusted_host = utils.get_host_from_url(web_base_url); var trusted_protocol = utils.get_protocol_from_url(web_base_url); var trusted_origin = utils.build_origin(trusted_protocol, trusted_host); +ajax.loadXML('/web/static/src/xml/base_common.xml', core.qweb); + // Patch the editor's behavior when it is launched inside an iframe. if (window.self !== window.top) { $(document.body).addClass('o_in_iframe'); // in order to apply css rules |
