diff options
| -rw-r--r-- | addons/web/static/src/js/boot.js | 6 | ||||
| -rw-r--r-- | 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 @@ <script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script> + <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script> + <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script> + <script type="text/javascript" charset="utf-8"> + openerp._modules = <t t-raw="modules"/>; + </script> + <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/> </template> @@ -83,8 +89,6 @@ <link rel="stylesheet" href="/web/static/src/css/data_export.css"/> <link rel="stylesheet" href="/base/static/src/css/modules.css"/> - <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script> - <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script> <script type="text/javascript" src="/web/static/lib/py.js/lib/py.js"></script> <script type="text/javascript" src="/web/static/src/js/boot.js"></script> <script type="text/javascript" src="/web/static/src/js/testing.js"></script> @@ -136,7 +140,7 @@ <t t-call-assets="web.assets_backend"/> <script type="text/javascript"> $(function() { - var s = new openerp.init(<t t-raw="modules"/>); + var s = new openerp.init(); <t t-if="init"> <t t-raw="init"/> </t> |