summaryrefslogtreecommitdiff
path: root/addons/website/controllers/main.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-03-18 14:05:02 +0100
committerChristophe Simonis <chs@odoo.com>2015-03-18 14:05:02 +0100
commita329aa19499c4e59e97abd02401196bab66687c2 (patch)
treefe256e4a17f1f33a9d41adcf5860b38a5a7d4b58 /addons/website/controllers/main.py
parenta757fce9d639d47665d6e9c1bce9a82909fcb6ec (diff)
[MERGE] forward port of branch 8.0 up to e27744d
Diffstat (limited to 'addons/website/controllers/main.py')
-rw-r--r--addons/website/controllers/main.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index d7262d54c6d..ba7166b45a8 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -480,7 +480,10 @@ class Website(openerp.addons.web.controllers.main.Home):
#------------------------------------------------------
# Server actions
#------------------------------------------------------
- @http.route('/website/action/<path_or_xml_id_or_id>', type='http', auth="public", website=True)
+ @http.route([
+ '/website/action/<path_or_xml_id_or_id>',
+ '/website/action/<path_or_xml_id_or_id>/<path:path>',
+ ], type='http', auth="public", website=True)
def actions_server(self, path_or_xml_id_or_id, **post):
cr, uid, context = request.cr, request.uid, request.context
res, action_id, action = None, None, None