From 9577dcbc3a2619843378a09f0627aefb3255a10f Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 22 Jul 2020 06:49:30 +0000
Subject: [PATCH] [IMP] website_[blog/shop/forum]: rename routes to remove
 'useless' part

Retro-compatibility routes
---
 addons/website_blog/controllers/main.py  | 8 ++++++++
 addons/website_forum/controllers/main.py | 7 +++++++
 addons/website_sale/controllers/main.py  | 6 ++++++
 3 files changed, 21 insertions(+)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index a35dd14857c..e24c1aabbc4 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -10,6 +10,7 @@ from collections import OrderedDict
 from odoo import http, fields
 from odoo.addons.http_routing.models.ir_http import slug, unslug
 from odoo.addons.website.controllers.main import QueryURL
+from odoo.addons.portal.controllers.portal import _build_url_w_params
 from odoo.http import request
 from odoo.osv import expression
 from odoo.tools import html2plaintext
@@ -189,6 +190,13 @@ class WebsiteBlog(http.Controller):
         r = request.render("website_blog.blog_feed", v, headers=[('Content-Type', 'application/atom+xml')])
         return r
 
+    @http.route([
+        '''/blog/<model("blog.blog"):blog>/post/<model("blog.post", "[('blog_id','=',blog.id)]"):blog_post>''',
+    ], type='http', auth="public", website=True, sitemap=False)
+    def old_blog_post(self, blog, blog_post, tag_id=None, page=1, enable_editor=None, **post):
+        # Compatibility pre-v14
+        return request.redirect(_build_url_w_params("/blog/%s/post/%s" % (slug(blog), slug(blog_post)), request.params), code=301)
+
     @http.route([
         '''/blog/<model("blog.blog"):blog>/<model("blog.post", "[('blog_id','=',blog.id)]"):blog_post>''',
     ], type='http', auth="public", website=True, sitemap=True)
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 2bd02cf1afc..1c9c5972e6e 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -14,6 +14,7 @@ from odoo import http, tools, _
 from odoo.addons.http_routing.models.ir_http import slug
 from odoo.addons.website.models.ir_http import sitemap_qs2dom
 from odoo.addons.website_profile.controllers.main import WebsiteProfile
+from odoo.addons.portal.controllers.portal import _build_url_w_params
 
 from odoo.http import request
 
@@ -221,6 +222,12 @@ class WebsiteForum(WebsiteProfile):
         except IOError:
             return False
 
+    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum.id),('parent_id','=',False),('can_view', '=', True)]"):question>'''],
+                type='http', auth="public", website=True, sitemap=False)
+    def old_question(self, forum, question, **post):
+        # Compatibility pre-v14
+        return request.redirect(_build_url_w_params("/forum/%s/question/%s" % (slug(forum), slug(question)), request.params), code=301)
+
     @http.route(['''/forum/<model("forum.forum"):forum>/<model("forum.post", "[('forum_id','=',forum.id),('parent_id','=',False),('can_view', '=', True)]"):question>'''],
                 type='http', auth="public", website=True, sitemap=True)
     def question(self, forum, question, **post):
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index a0116c6359a..123acb65293 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -13,6 +13,7 @@ from odoo.addons.payment.controllers.portal import PaymentProcessing
 from odoo.addons.website.controllers.main import QueryURL
 from odoo.addons.website.models.ir_http import sitemap_qs2dom
 from odoo.exceptions import ValidationError
+from odoo.addons.portal.controllers.portal import _build_url_w_params
 from odoo.addons.website.controllers.main import Website
 from odoo.addons.website_form.controllers.main import WebsiteForm
 from odoo.osv import expression
@@ -309,6 +310,11 @@ class WebsiteSale(http.Controller):
 
         return request.render("website_sale.product", self._prepare_product_values(product, category, search, **kwargs))
 
+    @http.route(['/shop/product/<model("product.template"):product>'], type='http', auth="public", website=True, sitemap=False)
+    def old_product(self, product, category='', search='', **kwargs):
+        # Compatibility pre-v14
+        return request.redirect(_build_url_w_params("/shop/%s" % slug(product), request.params), code=301)
+
     def _prepare_product_values(self, product, category, search, **kwargs):
         add_qty = int(kwargs.get('add_qty', 1))