diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-08-26 10:45:54 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-08-26 10:45:54 +0200 |
| commit | 8f33049f2fbe2e109a4f75d3e33953abd4e506c9 (patch) | |
| tree | e2b44c431bf08633a361728d127a1d6ebc4f44cc /addons/im/static | |
| parent | b874f4bec27aa607f6958d7085d47fe44de5c748 (diff) | |
Changed user field to user_id and added unique constraint
bzr revid: nicolas.vanhoren@openerp.com-20130826084554-221ts80q8c5jvqv1
Diffstat (limited to 'addons/im/static')
| -rw-r--r-- | addons/im/static/src/js/im.js | 2 | ||||
| -rw-r--r-- | addons/im/static/src/js/im_common.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js index 9af04bf4f43..6af9b27c804 100644 --- a/addons/im/static/src/js/im.js +++ b/addons/im/static/src/js/im.js @@ -87,7 +87,7 @@ var self = this; return this.user_search_dm.add(users.call("search_users", [[["name", "ilike", this.get("current_search")], ["id", "<>", instance.session.uid]], - ["name", "user", "uuid", "im_status"], USERS_LIMIT], {context:new instance.web.CompoundContext()})).then(function(result) { + ["name", "user_id", "uuid", "im_status"], 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; diff --git a/addons/im/static/src/js/im_common.js b/addons/im/static/src/js/im_common.js index a6314a978e2..bf89bccddcb 100644 --- a/addons/im/static/src/js/im_common.js +++ b/addons/im/static/src/js/im_common.js @@ -35,8 +35,8 @@ function declare($, _, openerp) { user_rec.image_url = im_common.connection.url("/im/static/src/img/avatar/avatar.jpeg"); // TODO : check it works correctly - if (user_rec.user) - user_rec.image_url = im_common.connection.url('/web/binary/image', {model:'res.users', field: 'image_small', id: user_rec.user[0]}); + 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;*/ |