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

[FIX] Response default mimetype 

bzr revid: fme@openerp.com-20140219102903-h8n070qqbbhlnenr
This commit is contained in:
Fabien Meghazi 2014-02-19 11:29:03 +01:00
parent 48d1e2d879
commit 3315938178
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openerp/http.py
View File

@ -275,10 +275,15 @@ def route(route=None, **kw):
return response return response
elif isinstance(response, LazyResponse): elif isinstance(response, LazyResponse):
raise "TODO: remove LazyResponses ???" raise "TODO: remove LazyResponses ???"
else: elif isinstance(response, werkzeug.wrappers.BaseResponse):
response = Response.force_type(response) response = Response.force_type(response)
response.set_default() response.set_default()
return response return response
elif isinstance(response, basestring):
return Response(response)
else:
raise "TODO: shall we autorise this ?"
return response
response_wrap.routing = routing response_wrap.routing = routing
return response_wrap return response_wrap
return decorator return decorator
@ -490,7 +495,7 @@ class HttpRequest(WebRequest):
response.set_cookie(k, v) response.set_cookie(k, v)
return response return response
def render(self, template, qcontext=None, mimetype='text/html', **kw): def render(self, template, qcontext=None, **kw):
""" Lazy render of QWeb template. """ Lazy render of QWeb template.
The actual rendering of the given template will occur at then end of The actual rendering of the given template will occur at then end of
@ -500,7 +505,7 @@ class HttpRequest(WebRequest):
:param basestring template: template to render :param basestring template: template to render
:param dict qcontext: Rendering context to use :param dict qcontext: Rendering context to use
""" """
return Response(template=template, qcontext=qcontext, mimetype=mimetype, **kw) return Response(template=template, qcontext=qcontext, **kw)
def not_found(self, description=None): def not_found(self, description=None):
""" Helper for 404 response, return its result from the method """ Helper for 404 response, return its result from the method
@ -929,6 +934,7 @@ class Response(werkzeug.wrappers.Response):
:param dict qcontext: Rendering context to use :param dict qcontext: Rendering context to use
:param int uid: User id to use for the ir.ui.view render call :param int uid: User id to use for the ir.ui.view render call
""" """
default_mimetype = 'text/html'
def __init__(self, *args, **kw): def __init__(self, *args, **kw):
template = kw.pop('template', None) template = kw.pop('template', None)
qcontext = kw.pop('qcontext', None) qcontext = kw.pop('qcontext', None)