From 389574e550e58a7ac8a7acdb277a2908d223e13e Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Mon, 24 Oct 2016 17:19:19 +0200 Subject: [PATCH] [FIX] website: make the 'include assets bundle' option of ace editor work Commit which added summernote broke the ace editor with a strange change: https://github.com/odoo/odoo/commit/9069d0127c176317436b67b23ae5677dd9d53de7#diff-e9d66a1b466f404be082fa00519eafa5L140. With this change instead of not including the assets bundles in the ace editor and allowing to see them by checking the option, the assets bundles were included when NOT in debug mode and not included when in debug mode. --- addons/website/static/src/js/website.ace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js index ad39ac92025..2a3f149fbad 100644 --- a/addons/website/static/src/js/website.ace.js +++ b/addons/website/static/src/js/website.ace.js @@ -137,7 +137,7 @@ var args = { key: $(document.documentElement).data('view-xmlid'), full: true, - bundles: !!$('script[src*=".assets_common"]').length + bundles: this.$('.js_include_bundles')[0].checked }; return openerp .jsonRpc('/website/customize_template_get', 'call', args)