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

Enabled controllers not contained in modules 

bzr revid: nicolas.vanhoren@openerp.com-20131018140752-ha9qpb0mormxp7l0
This commit is contained in:
niv-openerp 2013-10-18 16:07:52 +02:00
parent ec291efb80
commit 87ee7c8b70
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openerp/http.py
View File

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