From dc50d0472d2225581f67410a592211a6f8669797 Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Thu, 8 Mar 2018 05:07:17 +0500 Subject: [PATCH] [11.0][MIG] dbfilter_from_header updates were made in #1137 by @TimLai125 and small lint fixes by @yelizariev --- dbfilter_from_header/README.rst | 3 ++- dbfilter_from_header/__init__.py | 20 +------------------- dbfilter_from_header/__manifest__.py | 4 ++-- dbfilter_from_header/override.py | 21 +++++++++++++++++++++ 4 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 dbfilter_from_header/override.py diff --git a/dbfilter_from_header/README.rst b/dbfilter_from_header/README.rst index 5107a5b2c..03293e46b 100644 --- a/dbfilter_from_header/README.rst +++ b/dbfilter_from_header/README.rst @@ -19,7 +19,7 @@ a server-wide module. This can be done with the ``load`` parameter in ``/etc/odoo.conf`` or with the ``--load`` command-line parameter -``load = "web, web_kanban, dbfilter_from_header"`` +``load = "web, dbfilter_from_header"`` Configuration ============= @@ -62,6 +62,7 @@ Contributors * Sandy Carter * Fabio Vilchez * Jos De Graeve +* Lai Tim Siu (Quaritle Limited) Maintainer ---------- diff --git a/dbfilter_from_header/__init__.py b/dbfilter_from_header/__init__.py index 4d7ba003e..b57de876a 100644 --- a/dbfilter_from_header/__init__.py +++ b/dbfilter_from_header/__init__.py @@ -1,20 +1,2 @@ -# -*- coding: utf-8 -*- -# © 2013 Therp BV -# © 2014 ACSONE SA/NV -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -import re -from odoo import http - -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') - if db_filter_hdr: - dbs = [db for db in dbs if re.match(db_filter_hdr, db)] - return dbs - -http.db_filter = db_filter +from . import override diff --git a/dbfilter_from_header/__manifest__.py b/dbfilter_from_header/__manifest__.py index 1b0a0106f..82f462f65 100644 --- a/dbfilter_from_header/__manifest__.py +++ b/dbfilter_from_header/__manifest__.py @@ -1,12 +1,12 @@ -# -*- coding: utf-8 -*- # © 2013 Therp BV # © 2014 ACSONE SA/NV +# Copyright 2018 Quartile Limited # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "dbfilter_from_header", "summary": "Filter databases with HTTP headers", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "author": "Therp BV,Odoo Community Association (OCA)", "license": "AGPL-3", "complexity": "normal", diff --git a/dbfilter_from_header/override.py b/dbfilter_from_header/override.py new file mode 100644 index 000000000..a347c30ed --- /dev/null +++ b/dbfilter_from_header/override.py @@ -0,0 +1,21 @@ +# © 2013 Therp BV +# © 2014 ACSONE SA/NV +# Copyright 2018 Quartile Limited +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import re +from odoo import http + +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') + if db_filter_hdr: + dbs = [db for db in dbs if re.match(db_filter_hdr, db)] + return dbs + + +http.db_filter = db_filter