From: niv-openerp Date: Mon, 26 Aug 2013 08:52:12 +0000 (+0200) Subject: Now uses im.user's images X-Git-Tag: InsPy_master01~1007^2~3 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=7bce27c528f4c5aaf9838eff2803d3ecd68228b0;p=odoo%2Fodoo.git Now uses im.user's images bzr revid: nicolas.vanhoren@openerp.com-20130826085212-od9oxv6h4jtkd6nf --- diff --git a/addons/im/static/src/js/im_common.js b/addons/im/static/src/js/im_common.js index bf89bcc..6cfad35 100644 --- a/addons/im/static/src/js/im_common.js +++ b/addons/im/static/src/js/im_common.js @@ -32,13 +32,8 @@ function declare($, _, openerp) { im_common.ImUser = openerp.Class.extend(openerp.PropertiesMixin, { init: function(parent, user_rec) { openerp.PropertiesMixin.init.call(this, parent); - user_rec.image_url = im_common.connection.url("/im/static/src/img/avatar/avatar.jpeg"); - - // TODO : check it works correctly - if (user_rec.user_id) - user_rec.image_url = im_common.connection.url('/web/binary/image', {model:'res.users', field: 'image_small', id: user_rec.user_id[0]}); - /*if (user_rec.image) - user_rec.image_url = "data:image/png;base64," + user_rec.image;*/ + + user_rec.image_url = im_common.connection.url('/web/binary/image', {model:'im.user', field: 'image', id: user_rec.id}); this.set(user_rec); this.set("watcher_count", 0);