pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: do not use t-if inside assets

Browse Source 
This makes the assets to be recomputed everytime somebody with a different
language load the page.

closes odoo/odoo#31782

Signed-off-by: Olivier Dony (odo) <odo@openerp.com>
This commit is contained in:
Martin Trigaux
2019-03-12 10:58:53 +00:00
parent cd773e79df
commit 7e2f9634d2
3 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/views/point_of_sale.xml
+1 -3
View File
@@ -6,9 +6,7 @@
<link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css" id="pos-stylesheet"/>
<link rel="stylesheet" href="/point_of_sale/static/src/css/keyboard.css"/>
<t t-if="request and request.env['res.lang'].search([('code', '=', request.env.lang)]).direction == 'rtl'">
<link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overriden.scss"/>
</t>
<link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overriden.scss"/>
<script type="text/javascript" src="/point_of_sale/static/lib/waitfont.js"></script>
<script type="text/javascript" src="/point_of_sale/static/src/js/main.js"></script>
addons/web/static/src/scss/fontawesome_overriden.scss
+35 -33
View File
@@ -1,36 +1,38 @@
// This is rtl language specific fix
// It will override the font awesome symbols and flip them 180 degree
.fa {
&.fa-align-right,
&.fa-align-left,
&.fa-chevron-right,
&.fa-chevron-left,
&.fa-arrow-right,
&.fa-arrow-left,
&.fa-hand-o-right,
&.fa-hand-o-left,
&.fa-arrow-circle-right,
&.fa-arrow-circle-left,
&.fa-caret-right,
&.fa-caret-left,
&.fa-rotate-right,
&.fa-rotate-left,
&.fa-angle-double-right,
&.fa-angle-double-left,
&.fa-angle-right,
&.fa-angle-left,
&.fa-quote-right,
&.fa-quote-left,
&.fa-chevron-circle-right,
&.fa-chevron-circle-left,
&.fa-long-arrow-right,
&.fa-long-arrow-left,
&.fa-toggle-right,
&.fa-toggle-left,
&.fa-caret-square-o-right,
&.fa-arrow-circle-o-left,
&.fa-arrow-circle-o-right,
&.fa-caret-square-o-left {
transform: rotate(180deg);
.o_rtl {
.fa {
&.fa-align-right,
&.fa-align-left,
&.fa-chevron-right,
&.fa-chevron-left,
&.fa-arrow-right,
&.fa-arrow-left,
&.fa-hand-o-right,
&.fa-hand-o-left,
&.fa-arrow-circle-right,
&.fa-arrow-circle-left,
&.fa-caret-right,
&.fa-caret-left,
&.fa-rotate-right,
&.fa-rotate-left,
&.fa-angle-double-right,
&.fa-angle-double-left,
&.fa-angle-right,
&.fa-angle-left,
&.fa-quote-right,
&.fa-quote-left,
&.fa-chevron-circle-right,
&.fa-chevron-circle-left,
&.fa-long-arrow-right,
&.fa-long-arrow-left,
&.fa-toggle-right,
&.fa-toggle-left,
&.fa-caret-square-o-right,
&.fa-arrow-circle-o-left,
&.fa-arrow-circle-o-right,
&.fa-caret-square-o-left {
transform: rotate(180deg);
}
}
}
}
addons/web/views/webclient_templates.xml
+1 -3
View File
@@ -65,9 +65,7 @@
<link rel="stylesheet" type="text/scss" href="/web/static/src/scss/colorpicker.scss"/>
<link rel="stylesheet" type="text/scss" href="/web/static/src/scss/keyboard.scss"/>
<t t-if="request and request.env['res.lang'].search([('code', '=', request.env.lang)]).direction == 'rtl'">
<link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overriden.scss"/>
</t>
<link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overriden.scss"/>
<script type="text/javascript" src="/web/static/lib/es5-shim/es5-shim.min.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>