diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-05-12 17:18:12 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-05-12 17:18:12 +0200 |
| commit | f3c8cc50c8e59294d7b0f9c9dbda4a0d673a3d5e (patch) | |
| tree | f9ece3d6e68e81b9063f68e27e08955f64206ef5 /addons/web/static | |
| parent | 27a6d2e9f4ebf1449d4771219609d8483b2ba04e (diff) | |
[IMP] Include openerpframework in common assets. Add module list in bundle
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/boot.js | 6 |
1 files changed, 3 insertions, 3 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) |