odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] im_chat, im_livechat : fix the loading history for anonymous user and remove useless search_user_status rpc call.

This commit is contained in:
Jérome Maes 2014-09-25 16:30:50 +02:00
parent 57869b9001
commit 17b486f6f9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/im_chat/static/src/js/im_chat.js
View File

@ -263,6 +263,8 @@
if(messages.length != NBR_LIMIT_HISTORY){
self.loading_history = false;
}
}else{
self.loading_history = false;
}
});
}
@ -479,7 +481,6 @@
this.calc_box();
this.on("change:current_search", this, this.search_users_status);
this.search_users_status();
// add a drag & drop listener
self.c_manager.on("im_session_activated", self, function(conv) {

4
addons/im_livechat/im_livechat.py
View File

@ -198,7 +198,7 @@ class im_chat_session(osv.Model):
""" return if the given user_id is in the session """
sids = self.search(cr, uid, [('uuid', '=', uuid)], context=context, limit=1)
for session in self.browse(cr, uid, sids, context=context):
if session.anonymous_name and not user_id:
if session.anonymous_name and user_id == openerp.SUPERUSER_ID:
return True
else:
return super(im_chat_session, self).is_in_session(cr, uid, uuid, user_id, context=context)
@ -234,7 +234,7 @@ class LiveChatController(http.Controller):
return request.render('im_livechat.loader', info)
@http.route('/im_livechat/get_session', type="json", auth="none")
def get_session(self, channel_id, anonymous_name):
def get_session(self, channel_id, anonymous_name, **kwargs):
cr, uid, context, db = request.cr, request.uid or openerp.SUPERUSER_ID, request.context, request.db
reg = openerp.modules.registry.RegistryManager.get(db)
# if geoip, add the country name to the anonymous name