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

[FIX] CORS routing should use new routing api 

bzr revid: fme@openerp.com-20140131104840-e0557qke365ym2x4
This commit is contained in:
Fabien Meghazi 2014-01-31 11:48:40 +01:00
parent 93bbdc6b53
commit 3fac414239
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openerp/http.py
View File

@ -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