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

[FIX] im_livechat: correct loader js code

Browse Source
This commit is contained in:
Christophe Simonis
2016-01-07 18:16:20 +01:00
parent 61cf01b7a8
commit 100d604cb0
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/im_livechat/controllers/main.py
+2 -1
View File
@@ -30,7 +30,8 @@ class LivechatController(http.Controller):
username = kwargs.get("username", _("Visitor")) username = kwargs.get("username", _("Visitor"))
channel = request.env['im_livechat.channel'].sudo().browse(channel_id) channel = request.env['im_livechat.channel'].sudo().browse(channel_id)
info = request.env['im_livechat.channel'].get_livechat_info(channel.id, username=username) info = request.env['im_livechat.channel'].get_livechat_info(channel.id, username=username)
return request.render('im_livechat.loader', {'info': info, 'web_session_required': True}) if info['available'] else False js = request.render('im_livechat.loader', {'info': info, 'web_session_required': True})
return request.make_response(js, headers=[('Content-Type', 'application/javascript')])
@http.route('/im_livechat/init', type='json', auth="public") @http.route('/im_livechat/init', type='json', auth="public")
def livechat_init(self, channel_id): def livechat_init(self, channel_id):
addons/im_livechat/models/im_livechat_channel.py
+1 -1
View File
@@ -195,7 +195,7 @@ class ImLivechatChannel(models.Model):
@api.model @api.model
def get_livechat_info(self, channel_id, username='Visitor'): def get_livechat_info(self, channel_id, username='Visitor'):
info = {} info = {}
info['available'] = len(self.browse(channel_id).get_available_users()) info['available'] = len(self.browse(channel_id).get_available_users()) > 0
if info['available']: if info['available']:
info['server_url'] = self.env['ir.config_parameter'].get_param('web.base.url') info['server_url'] = self.env['ir.config_parameter'].get_param('web.base.url')
info['options'] = self.sudo().get_channel_infos(channel_id) info['options'] = self.sudo().get_channel_infos(channel_id)
addons/im_livechat/views/im_livechat_channel_templates.xml
+2 -2
View File
@@ -143,7 +143,6 @@
<t t-set="info" t-value="request.env['im_livechat.channel'].get_livechat_info(channel)"/> <t t-set="info" t-value="request.env['im_livechat.channel'].get_livechat_info(channel)"/>
</t> </t>
<t t-if="info['available']" t-translation="off">
document.addEventListener("DOMContentLoaded", function(event) { document.addEventListener("DOMContentLoaded", function(event) {
<t t-if="web_session_required"> <t t-if="web_session_required">
odoo.define('web.session', function (require) { odoo.define('web.session', function (require) {
@@ -154,6 +153,7 @@
</t> </t>
odoo.define('im_livechat.livesupport', function (require) { odoo.define('im_livechat.livesupport', function (require) {
<t t-if="info['available']" t-translation="off">
var im_livechat = require('im_livechat.im_livechat'); var im_livechat = require('im_livechat.im_livechat');
var button = new im_livechat.LivechatButton( var button = new im_livechat.LivechatButton(
$('body'), $('body'),
@@ -162,9 +162,9 @@
); );
button.appendTo($('body')); button.appendTo($('body'));
window.livechat_button = button; window.livechat_button = button;
</t>
}); });
}); });
</t>
</template> </template>