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

[FIX] web: handle monodb correctly when server started with "--no-database-list" option 

bzr revid: chs@openerp.com-20130611110327-sipc2er6z1ch7leb
This commit is contained in:
Christophe Simonis 2013-06-11 13:03:27 +02:00
parent 0fc8333985
commit 36e113e6bd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/web/controllers/main.py
View File

@ -84,9 +84,9 @@ def rjsmin(script):
).strip() ).strip()
return result return result
def db_list(req): def db_list(req, force=False):
proxy = req.session.proxy("db") proxy = req.session.proxy("db")
dbs = proxy.list() dbs = proxy.list(force)
h = req.httprequest.environ['HTTP_HOST'].split(':')[0] h = req.httprequest.environ['HTTP_HOST'].split(':')[0]
d = h.split('.')[0] d = h.split('.')[0]
r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d', d) r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
@ -103,7 +103,7 @@ def db_monodb_redirect(req):
return (db_url, False) return (db_url, False)
try: try:
dbs = db_list(req) dbs = db_list(req, True)
except xmlrpclib.Fault: except xmlrpclib.Fault:
# ignore access denied # ignore access denied
dbs = [] dbs = []
@ -757,6 +757,10 @@ class Database(openerpweb.Controller):
@openerpweb.jsonrequest @openerpweb.jsonrequest
def get_list(self, req): def get_list(self, req):
# TODO change js to avoid calling this method if in monodb mode
monodb = db_monodb(req)
if monodb:
return [monodb]
return db_list(req) return db_list(req)
@openerpweb.jsonrequest @openerpweb.jsonrequest