[MERGE] forward port branch saas-11.3 up to 3cdcbce93cb

1 files changed, 22 insertions, 3 deletions

diff --git a/addons/web/models/ir_qweb.py b/addons/web/models/ir_qweb.py
index a7376e04b5d..29426b9d8a8 100644
--- a/addons/web/models/ir_qweb.py
+++ b/addons/web/models/ir_qweb.py
@@ -2,6 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import hashlib
+from collections import OrderedDict
 
 from odoo import api, models
 from odoo.tools import pycompat
@@ -57,6 +58,24 @@ class Image(models.AbstractModel):
         elif options.get('zoom'):
             src_zoom = options['zoom']
 
-        img = '<img class="%s" src="%s" style="%s"%s%s/>' % \
-            (classes, src, options.get('style', ''), ' alt="%s"' % alt if alt else '', ' data-zoom="1" data-zoom-image="%s"' % src_zoom if src_zoom else '')
-        return pycompat.to_text(img)
+        atts = OrderedDict()
+        atts["src"] = src
+        atts["class"] = classes
+        atts["style"] = options.get('style')
+        atts["alt"] = alt
+        atts["data-zoom"] = src_zoom and u'1' or None
+        atts["data-zoom-image"] = src_zoom
+
+        atts = self.env['ir.qweb']._post_processing_att('img', atts, options.get('template_options'))
+
+        img = ['<img']
+        for name, value in atts.items():
+            if value:
+                img.append(' ')
+                img.append(escape(pycompat.to_text(name)))
+                img.append('="')
+                img.append(escape(pycompat.to_text(value)))
+                img.append('"')
+        img.append('/>')
+
+        return u''.join(img)