Skip to content

Commit 54f8a31

Browse files
committed
[IMP] base,all: remove deprecated 't-esc' ir.qweb directive
closes #326 Related: odoo/odoo#228421 Related: odoo/enterprise#95456 Related: odoo/documentation#14675 Related: odoo/upgrade#8493 Related: odoo/design-themes#1150 Signed-off-by: Christophe Simonis (chs) <[email protected]>
1 parent e9c8bde commit 54f8a31

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

src/util/release-note.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<t t-if="odoo_showcase_video_id">
77
<br/>
88
<a t-attf-href="https://www.youtube.com/watch?v={{ odoo_showcase_video_id }}" target="_blank">
9-
<b>Meet Odoo <t t-esc="major_version"/>.<t t-esc="minor_version"/> now !</b>
9+
<b>Meet Odoo <t t-out="major_version"/>.<t t-out="minor_version"/> now !</b>
1010
<div class="card shadow-sm yt-container" style="max-height: 360px; max-width: 640px">
1111
<img t-attf-src="https://img.youtube.com/vi/{{ odoo_showcase_video_id }}/maxresdefault.jpg"/>
1212
</div>

src/util/report-migration.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<t t-name="mail.report_migration">
3-
<h2> Congratulations, you have just upgraded to Odoo <t t-esc="version" /> </h2>
3+
<h2> Congratulations, you have just upgraded to Odoo <t t-out="version" /> </h2>
44
<p> Here are changes that may impact day to day flows in this new version. </p>
55
<p t-if="int(minor_version) == 0">Want to know more? Check out the full functional <a t-attf-href="https://www.odoo.com/odoo-{{ major_version }}-release-notes">release note</a>.</p>
66
<p t-elif="int(minor_version) >= 0">Want to know more? Check out the full functional <a t-attf-href="https://www.odoo.com/odoo-{{ major_version }}-{{ minor_version }}-release-notes">release note</a>.</p>
77
<p t-else=""></p>
88
<br/>
99
<t t-foreach="messages" t-as="category">
10-
<h3><t t-esc="category"/></h3>
10+
<h3><t t-out="category"/></h3>
1111
<ul>
1212
<t t-if="category in ['Disabled views', 'Overridden views']">
1313
<t t-set="view_message_types" t-value="{
@@ -17,14 +17,14 @@
1717
<t t-set="message_type" t-value="view_message_types[category]"/>
1818
<li><details t-if="messages[category]">
1919
<summary>
20-
<t t-esc="message_type[0]"/>
20+
<t t-out="message_type[0]"/>
2121
</summary>
2222
<ul>
2323
<t t-foreach="messages[category]" t-as="message">
2424
<t t-set="view" t-value="message[0]"/>
2525
<li>
2626
<t t-if="view.get('copy_id')">
27-
<t t-esc="message_type[1] % view"/>
27+
<t t-out="message_type[1] % view"/>
2828
&amp;nbsp;
2929
<t t-raw="get_anchor_link_to_record('ir.ui.view', view['id'], 'Original', action_id=action_view_id)"/>
3030
&amp;nbsp;
@@ -50,7 +50,7 @@
5050
</t>
5151
<t t-else="">
5252
<t t-foreach="messages[category]" t-as="message">
53-
<li><t t-if="message[1]" t-raw="message[0]" /><t t-else="" t-esc="message[0]" /></li>
53+
<li><t t-if="message[1]" t-raw="message[0]" /><t t-else="" t-out="message[0]" /></li>
5454
</t>
5555
</t>
5656
</ul>

src/util/report.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ def announce_release_note(cr):
130130
filepath = os.path.join(os.path.dirname(__file__), "release-note.xml")
131131
with open(filepath, "rb") as fp:
132132
contents = fp.read()
133+
if not version_gte("15.0"):
134+
contents = contents.replace(b"t-out", b"t-esc")
133135
report = lxml.etree.fromstring(contents)
134136
e = env(cr)
135137
major_version, minor_version = re.findall(r"\d+", release.major_version)
@@ -151,6 +153,8 @@ def announce_migration_report(cr):
151153
contents = fp.read()
152154
if Markup:
153155
contents = contents.replace(b"t-raw", b"t-out")
156+
if not version_gte("15.0"):
157+
contents = contents.replace(b"t-out", b"t-esc")
154158
report = lxml.etree.fromstring(contents)
155159
e = env(cr)
156160
major_version, minor_version = re.findall(r"\d+", release.major_version)

0 commit comments

Comments
 (0)