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

[FIX] check after openerp's AccessErrors in website's _handle_exception

This commit is contained in:
Fabien Meghazi 2014-06-25 12:20:40 +02:00
parent 4e0799e163
commit f988d75035
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/website/models/ir_http.py
View File

@ -98,7 +98,7 @@ class ir_http(orm.AbstractModel):
werkzeug.exceptions.abort(werkzeug.utils.redirect(url))
def _handle_exception(self, exception, code=500):
is_website_request = getattr(request, 'website_enabled', False) and request.website
is_website_request = bool(getattr(request, 'website_enabled', False) and request.website)
if not is_website_request:
# Don't touch non website requests exception handling
return super(ir_http, self)._handle_exception(exception)
@ -119,6 +119,9 @@ class ir_http(orm.AbstractModel):
)
code = getattr(exception, 'code', code)
if isinstance(exception, openerp.exceptions.AccessError):
code = 403
if isinstance(exception, ir_qweb.QWebException):
values.update(qweb_exception=exception)
if isinstance(exception.qweb.get('cause'), openerp.exceptions.AccessError):