summaryrefslogtreecommitdiff
path: root/addons/website/models/website.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-01-12 18:48:49 +0100
committerChristophe Simonis <chs@odoo.com>2016-01-12 18:48:49 +0100
commit740a6eadd379cc3fa26aefb9350f1c95b3e05ebd (patch)
tree57467b1da563962e02dd9f2ba17e805c5cc5fdce /addons/website/models/website.py
parent63c7488926394a8d5bd44b991c881957e0405c8b (diff)
parent3c7b08c030daf84323279b3d87361214e4f1b729 (diff)
[MERGE] forward port of branch saas-8 up to 3c7b08c
Diffstat (limited to 'addons/website/models/website.py')
-rw-r--r--addons/website/models/website.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 0da99622cea..194fa73f9be 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -478,7 +478,8 @@ class website(osv.osv):
:rtype: bool
"""
endpoint = rule.endpoint
- methods = rule.methods or ['GET']
+ methods = endpoint.routing.get('method') or ['GET']
+
converters = rule._converters.values()
if not ('GET' in methods
and endpoint.routing['type'] == 'http'