diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-19 11:11:38 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-19 11:11:38 +0530 |
| commit | 4346af9c96ddc0e88d2d55d47ee0c4e21865aa2d (patch) | |
| tree | 24feb522a8d01a5babe5a5a6fde7cc1c77b7de25 /addons/web/static/src/js/boot.js | |
| parent | 3646b669516f78aa0a1be69ca8a241468cc9d98b (diff) | |
| parent | 37209eb5e76a7b373a0f302e1f62be32fd2f37d2 (diff) | |
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121119054138-lkrx5jo1tgbr71ek
Diffstat (limited to 'addons/web/static/src/js/boot.js')
| -rw-r--r-- | addons/web/static/src/js/boot.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index 05ce709e80a..631a7f8c6f5 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -19,12 +19,14 @@ /** * OpenERP instance constructor * - * @param {Array} modules list of modules to initialize + * @param {Array|String} modules list of modules to initialize */ init: function(modules) { - // By default only web will be loaded, the rest will be by loaded - // by openerp.web.Session on the first session_authenticate - modules = _.union(['web'], modules || []); + if (modules === "fuck your shit, don't load anything you cunt") { + modules = []; + } else { + modules = _.union(['web'], modules || []); + } var new_instance = { // links to the global openerp _openerp: openerp, |