diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-11-20 11:17:33 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-11-20 11:17:33 +0100 |
| commit | 5a9f78302f0112dc37b4ca36a4f65b4250156a3c (patch) | |
| tree | 248bd9fba8b9c5f445561d7b623ce12af95c14e8 /addons/web/static/src/js/boot.js | |
| parent | e6b77eb820a7670b416319f314808e4b90931a01 (diff) | |
| parent | d9296387f00e33c68a1695987d789c90d61d7bfb (diff) | |
[MERGE] from trunk
when creating the instance, set instance.session.uid to 42 so the evaluator has something to chew on when it tries to create the evaluation context
bzr revid: xmo@openerp.com-20121120101733-b0ire11bbuywfi8u
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 8d75175e1e3..5d50841d78d 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, |