From 8593d93b9a9be8645f29698794f25648241519ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Wed, 18 Nov 2015 22:16:10 +0100 Subject: [PATCH] [ADD] - cherry picked 5737ebc --- dbfilter_from_header/__init__.py | 9 ++++++--- dbfilter_from_header/__openerp__.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dbfilter_from_header/__init__.py b/dbfilter_from_header/__init__.py index 5f8b01ec0..14138f080 100644 --- a/dbfilter_from_header/__init__.py +++ b/dbfilter_from_header/__init__.py @@ -28,9 +28,12 @@ db_filter_org = http.db_filter def db_filter(dbs, httprequest=None): dbs = db_filter_org(dbs, httprequest) httprequest = httprequest or http.request.httprequest - db_filter_hdr = \ - httprequest.environ.get('HTTP_X_ODOO_DBFILTER') or \ - httprequest.environ.get('HTTP_X_OPENERP_DBFILTER') + db_filter_hdr_odoo = httprequest.environ.get('HTTP_X_ODOO_DBFILTER') + db_filter_hdr_openerp = httprequest.environ.get('HTTP_X_OPENERP_DBFILTER') + if db_filter_hdr_odoo and db_filter_hdr_openerp: + raise RuntimeError("x-odoo-dbfilter and x-openerp-dbfiter " + "are both set") + db_filter_hdr = db_filter_hdr_odoo or db_filter_hdr_openerp if db_filter_hdr: dbs = [db for db in dbs if re.match(db_filter_hdr, db)] return dbs diff --git a/dbfilter_from_header/__openerp__.py b/dbfilter_from_header/__openerp__.py index f7308f54b..32b2651ab 100644 --- a/dbfilter_from_header/__openerp__.py +++ b/dbfilter_from_header/__openerp__.py @@ -30,8 +30,9 @@ This is interesting for setups where database names can't be mapped to proxied host names. - In nginx, use + In nginx, use one of proxy_set_header X-OpenERP-dbfilter [your filter]; + proxy_set_header X-Odoo-dbfilter [your filter]; The addon has to be loaded as server-wide module. """,