Merge pull request #611 from odoo-dev/saas-3-really-fix-session-expired-fme
authorodony <odo@openerp.com>
Fri, 20 Jun 2014 09:02:22 +0000 (11:02 +0200)
committerodony <odo@openerp.com>
Fri, 20 Jun 2014 09:02:22 +0000 (11:02 +0200)
commite32cf31fa61488b1e133cc0a4aa95fdf998f6192
treea6f56d5bd6f9da3369fc165e8af859c21265c075
parentf855f1c1622716d68d2d64aec34f97f59d6ea47e
parentfef8077df31988f984d8f80ce8050a05bbe145eb
Merge pull request #611 from odoo-dev/saas-3-really-fix-session-expired-fme

[MERGE]  http routing: fix handle_exception logic and _authenticate exceptions

* Better separate JsonRequest and HttpRequest handling
for exceptions, so each type of request handles exception
the right way. Previously HttpRequest would supersede
JsonRequest in some cases and generate pure HTML
responses where a JSON result was expected.
* Also ensure that ir.http._authenticate() only raises
two possible exception types, hiding any other kind
of internal errors:
 - openerp.exceptions.AccessDenied
 - openerp.http.SessionExpiredException