diff options
| author | Denis Ledoux <dle@odoo.com> | 2019-05-02 09:42:08 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2019-05-02 09:45:14 +0200 |
| commit | fd0a10026c06315b4fbe520a7a3604a6b395f54a (patch) | |
| tree | 5a7183126ed508303bdab7a31d3691c75e6d9b4a /addons/website_livechat | |
| parent | 27eb8ba61798e7bc65bb75becc3f89c839a61996 (diff) | |
| parent | b11930047f6652ccf03963c3f18a2a38c502b652 (diff) | |
[MERGE] forward port branch saas-12.1 up to b11930047f6
Diffstat (limited to 'addons/website_livechat')
| -rw-r--r-- | addons/website_livechat/models/__init__.py | 3 | ||||
| -rw-r--r-- | addons/website_livechat/models/ir_http.py | 15 | ||||
| -rw-r--r-- | addons/website_livechat/views/website_livechat.xml | 28 |
3 files changed, 32 insertions, 14 deletions
diff --git a/addons/website_livechat/models/__init__.py b/addons/website_livechat/models/__init__.py index 13835e02e09..18f7d71a23d 100644 --- a/addons/website_livechat/models/__init__.py +++ b/addons/website_livechat/models/__init__.py @@ -2,4 +2,5 @@ from . import im_livechat from . import website -from . import res_config_settings
\ No newline at end of file +from . import res_config_settings +from . import ir_http diff --git a/addons/website_livechat/models/ir_http.py b/addons/website_livechat/models/ir_http.py new file mode 100644 index 00000000000..baeab9ea57e --- /dev/null +++ b/addons/website_livechat/models/ir_http.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models +from odoo.osv import expression + + +class IrHttp(models.AbstractModel): + _inherit = 'ir.http' + + @classmethod + def _get_translation_frontend_modules_domain(cls): + domain = super(IrHttp, cls)._get_translation_frontend_modules_domain() + return expression.OR([domain, [('name', '=', 'im_livechat')]]) + diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml index e5f429fc806..493de2d9cdb 100644 --- a/addons/website_livechat/views/website_livechat.xml +++ b/addons/website_livechat/views/website_livechat.xml @@ -167,19 +167,21 @@ </h5> <div class="col-lg-12"> <div class="row"> - <div class="col-lg-4 pl-0 pr-0"> - <img t-attf-src='/rating/static/src/img/rating_10.png' alt="Great" width="16px" height="16px"/> - <span class="align-middle"><t t-esc="ratings_per_user[user.partner_id.id]['great']"/>%</span> - </div> - <div class="col-lg-4 pl-0 pr-0"> - <img t-attf-src='/rating/static/src/img/rating_5.png' alt="Okay" width="16px" height="16px"/> - <span class="align-middle"><t t-esc="ratings_per_user[user.partner_id.id]['okay']"/>%</span> - </div> - <div class="col-lg-4 pl-0 pr-0"> - <img t-attf-src='/rating/static/src/img/rating_1.png' alt="Bad" width="16px" height="16px"/> - <span class="align-middle"><t t-esc="ratings_per_user[user.partner_id.id]['bad']"/>%</span> - </div> - <t t-if="user.partner_id.id not in ratings_per_user"> + <t t-if="user.partner_id.id in ratings_per_user"> + <div class="col-lg-4 pl-0 pr-0"> + <img t-attf-src='/rating/static/src/img/rating_10.png' alt="Great" width="16px" height="16px"/> + <span class="align-middle"><t t-esc="ratings_per_user[user.partner_id.id]['great']"/>%</span> + </div> + <div class="col-lg-4 pl-0 pr-0"> + <img t-attf-src='/rating/static/src/img/rating_5.png' alt="Okay" width="16px" height="16px"/> + <span class="align-middle"><t t-esc="ratings_per_user[user.partner_id.id]['okay']"/>%</span> + </div> + <div class="col-lg-4 pl-0 pr-0"> + <img t-attf-src='/rating/static/src/img/rating_1.png' alt="Bad" width="16px" height="16px"/> + <span class="align-middle"><t t-esc="ratings_per_user[user.partner_id.id]['bad']"/>%</span> + </div> + </t> + <t t-else=""> <div class="col-lg-12 pl-0 pr-0 o_livechat_no_rating">Not rated yet</div> </t> </div> |