From 3fac414239628948c7602e6db0f7376fc534b1d0 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Fri, 31 Jan 2014 11:48:40 +0100 Subject: [PATCH] [FIX] CORS routing should use new routing api bzr revid: fme@openerp.com-20140131104840-e0557qke365ym2x4 --- openerp/http.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/http.py b/openerp/http.py index 19b49de6da1..7ce70795a82 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -432,14 +432,14 @@ class HttpRequest(WebRequest): def dispatch(self): # TODO: refactor this correctly. This is a quick fix for pos demo. - if request.httprequest.method == 'OPTIONS' and request.func.cors: + if request.httprequest.method == 'OPTIONS' and request.func and request.func.routing.get('cors'): response = werkzeug.wrappers.Response(status=200) - response.headers.set('Access-Control-Allow-Origin', request.func.cors) + response.headers.set('Access-Control-Allow-Origin', request.func.routing['cors']) methods = 'GET, POST' if request.func_request_type == 'json': methods = 'POST' - elif request.func.methods: - methods = ', '.join(request.func.methods) + elif request.func.routing.get('methods'): + methods = ', '.join(request.func.routing['methods']) response.headers.set('Access-Control-Allow-Methods', methods) response.headers.set('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept') return response