From 4f9d9d169f65369e02dfde122150364a2d646c5c Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Wed, 25 Apr 2018 21:16:38 +0500 Subject: [PATCH] [IMP] website: multi-website snippets with the same key Allow duplicate snippets to have different versions for different websites This commit closes #24429 --- addons/web_editor/models/ir_qweb.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/web_editor/models/ir_qweb.py b/addons/web_editor/models/ir_qweb.py index e9643a6545c..a9492dac645 100644 --- a/addons/web_editor/models/ir_qweb.py +++ b/addons/web_editor/models/ir_qweb.py @@ -46,7 +46,12 @@ class QWeb(models.AbstractModel): def _compile_directive_snippet(self, el, options): el.set('t-call', el.attrib.pop('t-snippet')) - name = self.env['ir.ui.view'].search([('key', '=', el.attrib.get('t-call'))]).display_name + name = self.env['ir.ui.view'].search([ + ('key', '=', el.attrib.get('t-call')), + '|', + ('website_id', '=', options.get('website_id', False)), + ('website_id', '=', False) + ], order='website_id DESC', limit=1).display_name thumbnail = el.attrib.pop('t-thumbnail', "oe-thumbnail") div = u'
' % ( escape(pycompat.to_text(name)),