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

removed some stuff that was not useful any more 

bzr revid: nicolas.vanhoren@openerp.com-20130201154014-osu3s6y0qqytx7hs
This commit is contained in:
niv-openerp 2013-02-01 16:40:14 +01:00
parent 4d6910f0a6
commit 7f0e339efb
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/web_im/im.py
View File

@ -253,22 +253,7 @@ class im_user(osv.osv):
def search_users(self, cr, uid, domain, fields, limit, context=None):
found = self.pool.get('res.users').search(cr, uid, domain, limit=limit, context=context)
found = self.get_by_user_ids(cr, uid, found, context=context)
return self.read_users(cr, uid, found, fields, context)
def read_users(self, cr, uid, ids, fields, context=None):
statuses = self.read(cr, uid, ids, context = context)
by_id = {}
for x in statuses:
by_id[x["user"][0]] = x
res_users_ids = [x["user"][0] for x in statuses if x["user"]]
users = self.pool.get('res.users').read(cr, uid, res_users_ids, fields, context=context)
res = []
for x in users:
s = by_id[x["id"]]
x.update(s)
res.append(x)
return res
return self.read(cr, uid, found, fields, context=context)
def im_connect(self, cr, uid, context=None):
return self._im_change_status(cr, uid, True, context)
@ -307,6 +292,7 @@ class im_user(osv.osv):
_columns = {
'name': fields.related('user', 'name', type='char', size=200, string="Name", store=True, readonly=True),
'user': fields.many2one("res.users", string="User", select=True, ondelete='cascade'),
'im_last_received': fields.integer(string="Instant Messaging Last Received Message"),
'im_last_status': fields.boolean(strint="Instant Messaging Last Status"),

4
addons/web_im/static/src/js/im.js
View File

@ -89,7 +89,7 @@ openerp.web_im = function(instance) {
var self = this;
return this.user_search_dm.add(users.call("search_users",
[[["name", "ilike", this.get("current_search")], ["id", "<>", instance.session.uid]],
["name"], USERS_LIMIT], {context:new instance.web.CompoundContext()})).then(function(result) {
[], USERS_LIMIT], {context:new instance.web.CompoundContext()})).then(function(result) {
self.c_manager.add_to_user_cache(result);
self.$(".oe_im_input").val("");
var old_users = self.users;
@ -235,7 +235,7 @@ openerp.web_im = function(instance) {
if (_.size(no_cache) === 0)
return $.when();
else
return new instance.web.Model("im.user").call("read_users", [_.values(no_cache), ["name"]],
return new instance.web.Model("im.user").call("read", [_.values(no_cache), []],
{context: new instance.web.CompoundContext()}).then(function(users) {
self.add_to_user_cache(users);
});