From 847ee8333dc9c20bd40ab1135e2388406aa6f8e5 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Oct 2011 11:55:05 +0200
Subject: [PATCH] [FIX] correct module loading in local mode
bzr revid: chs@openerp.com-20111005095505-vepaqeupdn5qywcc
---
addons/web/controllers/main.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 9be0794a8bbe..843601da5f27 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -358,12 +358,18 @@ class Session(openerpweb.Controller):
@openerpweb.jsonrequest
def modules(self, req):
- # TODO query server for installed web modules
- mods = []
- for name, manifest in openerpweb.addons_manifest.items():
- # TODO replace by ir.module.module installed web
- if name not in req.config.server_wide_modules and manifest.get('active', True):
- mods.append(name)
+ candidates = [mod for mod in openerpweb.addons_manifest.keys() if mod not in req.config.server_wide_modules]
+
+ if req.config.backend == 'local':
+ # if local backend, the modules are shared with the server
+ Modules = req.session.model('ir.module.module')
+ ids = Modules.search(
+ ['&', ('state', '=', 'installed'), ('name', 'in', candidates)]
+ )
+ mods = map(operator.itemgetter('name'), Modules.read(ids, ['name']))
+
+ else:
+ mods = [name for name in candidates if openerpweb.addons_manifest[name].get('active', True)]
return mods
@openerpweb.jsonrequest
--
GitLab