diff options
| author | Jeremy Kersten <jke@odoo.com> | 2019-11-15 08:19:43 +0000 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2019-11-26 14:35:46 +0000 |
| commit | dc77f67cad95d0b0bd316cbdfc36a380f2daf73d (patch) | |
| tree | 2a72a21f498ca6f984af7f230852a62a5f5ecfe5 /addons/test_website | |
| parent | ef0488ef91161eba5267ea29fa5c6b379c483f29 (diff) | |
[FIX] website: match get/post in is_multilang_url
Old heuristic is not more True:
Force to check method to POST. Odoo uses methods : ['POST'] and ['GET', 'POST']
We have some controller that only allow 'GET' method, so we need to check GET
also when we try to know if an url is multilang or not.
This commit fix case where a controller '/test' only allow GET and you were in
another language that the default, in this case, the rendered url in qweb was
/get instead of /<lang>/get.
Closes #37223
closes odoo/odoo#40519
X-original-commit: c7650106f8588083be12812600a6c94ba703fd6f
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons/test_website')
| -rw-r--r-- | addons/test_website/controllers/main.py | 16 | ||||
| -rw-r--r-- | addons/test_website/tests/__init__.py | 1 | ||||
| -rw-r--r-- | addons/test_website/tests/test_is_multilang.py | 26 | ||||
| -rw-r--r-- | addons/test_website/views/templates.xml | 19 |
4 files changed, 62 insertions, 0 deletions
diff --git a/addons/test_website/controllers/main.py b/addons/test_website/controllers/main.py index b95dfddd2a1..1973e363653 100644 --- a/addons/test_website/controllers/main.py +++ b/addons/test_website/controllers/main.py @@ -103,3 +103,19 @@ class WebsiteTest(Home): @http.route('/test_access_denied_http', type='http', auth='public', website=True, sitemap=False) def test_denied_error_http(self, **kwargs): raise AccessDenied("This is an access denied http test") + + @http.route(['/get'], type='http', auth="public", methods=['GET'], website=True, sitemap=False) + def get_method(self, **kw): + return request.make_response('get') + + @http.route(['/post'], type='http', auth="public", methods=['POST'], website=True, sitemap=False) + def post_method(self, **kw): + return request.make_response('post') + + @http.route(['/get_post'], type='http', auth="public", methods=['GET', 'POST'], website=True, sitemap=False) + def get_post_method(self, **kw): + return request.make_response('get_post') + + @http.route(['/get_post_nomultilang'], type='http', auth="public", methods=['GET', 'POST'], website=True, multilang=False, sitemap=False) + def get_post_method_no_multilang(self, **kw): + return request.make_response('get_post_nomultilang') diff --git a/addons/test_website/tests/__init__.py b/addons/test_website/tests/__init__.py index 4fab1ec9b68..b7044f07875 100644 --- a/addons/test_website/tests/__init__.py +++ b/addons/test_website/tests/__init__.py @@ -2,6 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import test_controller_args +from . import test_is_multilang from . import test_reset_views from . import test_error from . import test_views_during_module_operation diff --git a/addons/test_website/tests/test_is_multilang.py b/addons/test_website/tests/test_is_multilang.py new file mode 100644 index 00000000000..69259f32054 --- /dev/null +++ b/addons/test_website/tests/test_is_multilang.py @@ -0,0 +1,26 @@ +# Part of Odoo. See LICENSE file for full copyright and licensing details. +import odoo.tests +import lxml + + +@odoo.tests.common.tagged('post_install', '-at_install') +class TestIsMultiLang(odoo.tests.HttpCase): + + def test_01_is_multilang_url(self): + website = self.env['website'].search([], limit=1) + fr = self.env.ref('base.lang_fr').sudo() + en = self.env.ref('base.lang_en').sudo() + + fr.active = True + fr_prefix = "/" + fr.iso_code + + website.default_lang_id = en + website.language_ids = en + fr + + for data in [None, {'post': True}]: # GET / POST + body = lxml.html.fromstring(self.url_open('/fr/multi_url', data=data).content) + + self.assertEqual(fr_prefix + '/get', body.find('./a[@id="get"]').get('href')) + self.assertEqual(fr_prefix + '/post', body.find('./form[@id="post"]').get('action')) + self.assertEqual(fr_prefix + '/get_post', body.find('./a[@id="get_post"]').get('href')) + self.assertEqual('/get_post_nomultilang', body.find('./a[@id="get_post_nomultilang"]').get('href')) diff --git a/addons/test_website/views/templates.xml b/addons/test_website/views/templates.xml index 23e71565a55..9d12bd612a6 100644 --- a/addons/test_website/views/templates.xml +++ b/addons/test_website/views/templates.xml @@ -13,4 +13,23 @@ <script type="text/javascript" src="/test_website/static/tests/tours/json_auth.js"></script> </xpath> </template> + + <record id="multi_url" model="website.page"> + <field name="name">Multi URL test</field> + <field name="url">/multi_url</field> + <field name="website_published">False</field> + <field name="type">qweb</field> + <field name="key">test_website.multi_url</field> + <field name="website_published">True</field> + <field name="arch" type="xml"> + <t t-name='multi_url'> + <div> + <a id='get' href="/get">get</a> + <form id='post' action="/post">post</form>> + <a id='get_post' href="/get_post">get_post</a> + <a id='get_post_nomultilang' href="/get_post_nomultilang">get_post_nomultilang</a> + </div> + </t> + </field> + </record> </odoo> |
