From f3c8cc50c8e59294d7b0f9c9dbda4a0d673a3d5e Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 12 May 2014 17:18:12 +0200 Subject: [PATCH 1/2] [IMP] Include openerpframework in common assets. Add module list in bundle --- addons/web/static/src/js/boot.js | 6 +++--- addons/web/views/webclient_templates.xml | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index cd58c3bb10a..5fad3d0a140 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -22,7 +22,7 @@ // this unique id will be replaced by hostname_databasename by // openerp.web.Session on the first connection _session_id: "instance0", - _modules: ['web'], + _modules: openerp._modules || ['web'], web_mobile: {}, /** * OpenERP instance constructor @@ -30,8 +30,8 @@ * @param {Array|String} modules list of modules to initialize */ init: function(modules) { - if (modules === null) { - modules = []; + if (modules === undefined) { + modules = openerp._modules; } modules = _.without(modules, "web"); if (inited) diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 66da9c3cd99..5a6c6aaea4c 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -20,6 +20,12 @@ + + + + @@ -83,8 +89,6 @@ - - @@ -136,7 +140,7 @@