From 27df588c15a0b27c2ea0fc6ff22d8e6b54cd9243 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 19 Nov 2021 11:50:52 +0000
Subject: [PATCH] [FIX] *: remove trailing slash from controllers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up of c1ae086cdb596115235e90473b6d263a2914050e

closes odoo/odoo#80139

X-original-commit: 58ee1a5906e4b2a50fb248085abd9caab97f4c52
Related: odoo/enterprise#22421
Signed-off-by: Romain Derie (rde) <rde@odoo.com>
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 addons/test_website/controllers/main.py                     | 4 ++--
 addons/web/controllers/profiling.py                         | 2 +-
 addons/website/controllers/form.py                          | 2 +-
 .../templates/default/controllers/controllers.py.template   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/test_website/controllers/main.py b/addons/test_website/controllers/main.py
index 63333b8157e..b278130fb7f 100644
--- a/addons/test_website/controllers/main.py
+++ b/addons/test_website/controllers/main.py
@@ -16,7 +16,7 @@ class WebsiteTest(Home):
     def test_view(self, **kwargs):
         return request.render('test_website.test_view')
 
-    @http.route('/ignore_args/converteronly/<string:a>/', type='http', auth="public", website=True, sitemap=False)
+    @http.route('/ignore_args/converteronly/<string:a>', type='http', auth="public", website=True, sitemap=False)
     def test_ignore_args_converter_only(self, a):
         return request.make_response(json.dumps(dict(a=a, kw=None)))
 
@@ -32,7 +32,7 @@ class WebsiteTest(Home):
     def test_ignore_args_kw(self, a, **kw):
         return request.make_response(json.dumps(dict(a=a, kw=kw)))
 
-    @http.route('/ignore_args/converter/<string:a>/', type='http', auth="public", website=True, sitemap=False)
+    @http.route('/ignore_args/converter/<string:a>', type='http', auth="public", website=True, sitemap=False)
     def test_ignore_args_converter(self, a, b='youhou', **kw):
         return request.make_response(json.dumps(dict(a=a, b=b, kw=kw)))
 
diff --git a/addons/web/controllers/profiling.py b/addons/web/controllers/profiling.py
index 79d1becaa0d..c36150bb2c1 100644
--- a/addons/web/controllers/profiling.py
+++ b/addons/web/controllers/profiling.py
@@ -20,7 +20,7 @@ class Profiling(Controller):
         except UserError as e:
             return Response(response='error: %s' % e, status=500)
 
-    @route(['/web/speedscope/', '/web/speedscope/<model("ir.profile"):profile>'], type='http', sitemap=False, auth='user')
+    @route(['/web/speedscope', '/web/speedscope/<model("ir.profile"):profile>'], type='http', sitemap=False, auth='user')
     def speedscope(self, profile=None):
         # don't server speedscope index if profiling is not enabled
         if not request.env['ir.profile']._enabled_until():
diff --git a/addons/website/controllers/form.py b/addons/website/controllers/form.py
index 5e162512c75..a354a514c5f 100644
--- a/addons/website/controllers/form.py
+++ b/addons/website/controllers/form.py
@@ -16,7 +16,7 @@ from odoo.addons.base.models.ir_qweb_fields import nl2br
 
 class WebsiteForm(http.Controller):
 
-    @http.route('/website/form/', type='http', auth="public", methods=['POST'], multilang=False)
+    @http.route('/website/form', type='http', auth="public", methods=['POST'], multilang=False)
     def website_form_empty(self, **kwargs):
         # This is a workaround to don't add language prefix to <form action="/website/form/" ...>
         return ""
diff --git a/odoo/cli/templates/default/controllers/controllers.py.template b/odoo/cli/templates/default/controllers/controllers.py.template
index de179de7d0b..d50a9186d92 100644
--- a/odoo/cli/templates/default/controllers/controllers.py.template
+++ b/odoo/cli/templates/default/controllers/controllers.py.template
@@ -6,18 +6,18 @@
 
 
 # class {{ mod|pascal }}(http.Controller):
-#     @http.route('{{ root }}/', auth='public')
+#     @http.route('{{ root }}', auth='public')
 #     def index(self, **kw):
 #         return "Hello, world"
 
-#     @http.route('{{ root }}/objects/', auth='public')
+#     @http.route('{{ root }}/objects', auth='public')
 #     def list(self, **kw):
 #         return http.request.render('{{ mod }}.listing', {
 #             'root': '{{ root }}',
 #             'objects': http.request.env['{{ model }}'].search([]),
 #         })
 
-#     @http.route('{{ root }}/objects/<model("{{ model }}"):obj>/', auth='public')
+#     @http.route('{{ root }}/objects/<model("{{ model }}"):obj>', auth='public')
 #     def object(self, obj, **kw):
 #         return http.request.render('{{ mod }}.object', {
 #             'object': obj