odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] remove base from listed modules 

bzr revid: al@openerp.com-20110723135344-xryjmq2hc259sm7g
This commit is contained in:
Antony Lesuisse 2011-07-23 15:53:44 +02:00
parent c93f5010d1
commit 8737e4af14
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/base/controllers/main.py
View File

@ -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,

2
addons/base/static/src/js/chrome.js
View File

@ -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);