From d7b0a56f34d569f090239588cd3e8cd9263f6429 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 29 Oct 2015 12:36:43 +0100 Subject: [PATCH] [FIX] website: add /website/image compatibility routes --- addons/website/controllers/main.py | 29 +++++++++++++++++++++++++++-- addons/website/models/website.py | 2 ++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index c51e7a62fd1..a501b7be8b7 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -13,8 +13,7 @@ import werkzeug.wrappers import openerp from openerp.addons.base.ir.ir_qweb import AssetsBundle -from openerp.addons.web.controllers.main import WebClient -from openerp.addons.web_editor.controllers.main import Web_Editor +from openerp.addons.web.controllers.main import WebClient, Binary from openerp.addons.web import http from openerp.http import request @@ -374,3 +373,29 @@ class Website(openerp.addons.web.controllers.main.Home): if res: return res return request.redirect('/') + + +#------------------------------------------------------ +# Retrocompatibility routes +#------------------------------------------------------ +class WebsiteBinary(openerp.http.Controller): + @http.route([ + '/website/image', + '/website/image/', + '/website/image//x', + '/website/image//', + '/website/image///x', + '/website/image///', + '/website/image////x' + ], type='http', auth="public", website=False, multilang=False) + def content_image(self, id=None, max_width=0, max_height=0, **kw): + if max_width: + kw['width'] = max_width + if max_height: + kw['height'] = max_height + if id: + id, _, unique = id.partition('_') + kw['id'] = int(id) + if unique: + kw['unique'] = unique + return Binary().content_image(**kw) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 1f24bbdf559..dfec85cb3e5 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -125,6 +125,8 @@ DEFAULT_CDN_FILTERS = [ "^/web/(css|js)/", "^/web/image", "^/web/content", + # retrocompatibility + "^/website/image/", ] def unslug(s):