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

Merge pull request #621 from odoo-dev/saas-4-fix_actions_server_controller_return-vta 

[FIX] website: controller for server actions should accept basic werkzeug requests (e.g. redirections)
This commit is contained in:
Martin Trigaux 2014-06-23 16:05:04 +02:00
parent 2b44ac2cd6 97174a2a9d
commit caea4a9aec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website/controllers/main.py
View File

@ -414,7 +414,7 @@ class Website(openerp.addons.web.controllers.main.Home):
action = ServerActions.browse(cr, uid, action_id, context=context)
if action.state == 'code' and action.website_published:
action_res = ServerActions.run(cr, uid, [action_id], context=context)
if isinstance(action_res, Response):
if isinstance(action_res, werkzeug.wrappers.Response):
res = action_res
if res:
return res