From 8737e4af14b1dbf01315bd2e10648f511f4126ab Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 23 Jul 2011 15:53:44 +0200 Subject: [PATCH] [IMP] remove base from listed modules bzr revid: al@openerp.com-20110723135344-xryjmq2hc259sm7g --- addons/base/controllers/main.py | 9 ++++++--- addons/base/static/src/js/chrome.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index b572fb6b67c..79de302f069 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -180,9 +180,12 @@ class Session(openerpweb.Controller): @openerpweb.jsonrequest def modules(self, req): - return {"modules": [name - for name, manifest in openerpweb.addons_manifest.iteritems() - if manifest.get('active', True)]} + # TODO query server for installed web modules + mods = [] + for name, manifest in openerpweb.addons_manifest.items(): + if name != 'base' and manifest.get('active', True): + mods.append(name) + return mods @openerpweb.jsonrequest def eval_domain_and_context(self, req, contexts, domains, diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 96e3db5bfaa..67738d7a348 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -452,7 +452,7 @@ openerp.base.Session = openerp.base.Controller.extend( /** @lends openerp.base.S load_modules: function() { var self = this; this.rpc('/base/session/modules', {}, function(result) { - self.module_list = result['modules']; + self.module_list = result; var modules = self.module_list.join(','); if(self.debug || true) { self.rpc('/base/webclient/csslist', {"mods": modules}, self.do_load_css);