From 87ee7c8b705e998387e54584a3981a9f8c0d9d1e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 18 Oct 2013 16:07:52 +0200 Subject: [PATCH] Enabled controllers not contained in modules bzr revid: nicolas.vanhoren@openerp.com-20131018140752-ha9qpb0mormxp7l0 --- openerp/http.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/openerp/http.py b/openerp/http.py index 7bad66cb7c4..659de8721ea 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -513,9 +513,10 @@ class ControllerType(type): name_class = ("%s.%s" % (cls.__module__, cls.__name__), cls) class_path = name_class[0].split(".") if not class_path[:2] == ["openerp", "addons"]: - return - # we want to know all modules that have controllers - module = class_path[2] + module = "" + else: + # we want to know all modules that have controllers + module = class_path[2] # but we only store controllers directly inheriting from Controller if not "Controller" in globals() or not Controller in bases: return @@ -1000,9 +1001,9 @@ class Root(object): url = url[: -1] routing_map.add(routing.Rule(url, endpoint=mv)) - modules_set = set(controllers_per_module.keys()) - set(['web']) + modules_set = set(controllers_per_module.keys()) - set(['', 'web']) # building all none methods - gen(["web"] + sorted(modules_set), True) + gen(['', "web"] + sorted(modules_set), True) if not db: return routing_map @@ -1014,7 +1015,7 @@ class Root(object): modules_set = modules_set & installed # building all other methods - gen(["web"] + sorted(modules_set), False) + gen(['', "web"] + sorted(modules_set), False) return routing_map