summaryrefslogtreecommitdiff
path: root/openerp/http.py
diff options
context:
space:
mode:
Diffstat (limited to 'openerp/http.py')
-rw-r--r--openerp/http.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/openerp/http.py b/openerp/http.py
index f0c8982a712..af151a0e325 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -321,6 +321,11 @@ class WebRequest(object):
""" Indicates whether the current request is in "debug" mode
"""
debug = 'debug' in self.httprequest.args
+
+ # check if request from rpc in debug mode
+ if not debug:
+ debug = self.httprequest.environ.get('HTTP_X_DEBUG_MODE')
+
if not debug and self.httprequest.referrer:
debug = bool(urlparse.parse_qs(urlparse.urlparse(self.httprequest.referrer).query, keep_blank_values=True).get('debug'))
return debug
@@ -1592,7 +1597,7 @@ class Root(object):
def get_db_router(self, db):
if not db:
return self.nodb_routing_map
- return request.registry['ir.http'].routing_map
+ return request.registry['ir.http'].routing_map()
def db_list(force=False, httprequest=None):
dbs = openerp.service.db.list_dbs(force)