Skip to content

Commit

Permalink
Merge pull request odoo#621 from odoo-dev/saas-4-fix_actions_server_c…
Browse files Browse the repository at this point in the history
…ontroller_return-vta

[FIX] website: controller for server actions should accept basic werkzeug requests (e.g. redirections)
  • Loading branch information
mart-e committed Jun 23, 2014
2 parents 2b44ac2 + 97174a2 commit caea4a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion addons/website/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ def actions_server(self, path_or_xml_id_or_id, **post):
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
Expand Down

0 comments on commit caea4a9

Please sign in to comment.