[MERGE] forward port branch saas-12.1 up to 6d4940675f1

1 files changed, 8 insertions, 1 deletions

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 0a36e8fa8ee..ea33aa114b2 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -4,6 +4,7 @@ import re
 from collections import OrderedDict
 
 from odoo import models
+from odoo.addons.http_routing.models.ir_http import url_for
 from odoo.http import request
 from odoo.addons.base.models.assetsbundle import AssetsBundle
 from odoo.tools import html_escape as escape
@@ -50,10 +51,16 @@ class QWeb(models.AbstractModel):
         if not website and options.get('website_id'):
             website = self.env['website'].browse(options['website_id'])
 
-        if not website or not website.cdn_activated:
+        if not website:
             return atts
 
         name = self.URL_ATTRS.get(tagName)
+        if request and name and name in atts:
+            atts[name] = url_for(atts[name])
+
+        if not website.cdn_activated:
+            return atts
+
         if name and name in atts:
             atts = OrderedDict(atts)
             atts[name] = website.get_cdn_url(atts[name])