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

Added real images 

bzr revid: nicolas.vanhoren@openerp.com-20121130162639-sr7w83l6u1zvs32r
This commit is contained in:
niv-openerp 2012-11-30 17:26:39 +01:00
parent c7784a9fbd
commit 3ded9e1512
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ openerp.web_im = function(instance) {
search_changed: function(e) {
var users = new instance.web.Model("res.users");
var self = this;
return this.user_search_dm.add(users.query(["name", "image"])
return this.user_search_dm.add(users.query(["name"])
.filter([["name", "ilike", this.get("current_search")]])
.limit(USERS_LIMIT).all()).then(function(result) {
self.add_to_user_cache(result);
@ -113,7 +113,7 @@ openerp.web_im = function(instance) {
if (_.size(no_cache) === 0)
return $.when();
else
return new instance.web.Model("res.users").call("read", [_.values(no_cache), ["name", "image"]],
return new instance.web.Model("res.users").call("read", [_.values(no_cache), ["name"]],
{context: new instance.web.CompoundContext()}).then(function(users) {
self.add_to_user_cache(users);
});
@ -201,6 +201,7 @@ openerp.web_im = function(instance) {
instance.web_im.ImUser = instance.web.Class.extend(instance.web.PropertiesMixin, {
init: function(parent, user_rec) {
instance.web.PropertiesMixin.init.call(this, parent);
user_rec.image_url = instance.session.url('/web/binary/image', {model:'res.users', field: 'image_small', id: user_rec.id});
this.set(user_rec);
this.set("watcher_count", 0);
this.on("change:watcher_count", this, function() {
@ -277,7 +278,7 @@ openerp.web_im = function(instance) {
this.$el.css("right", this.get("right_position"));
},
received_message: function(message) {
this._add_bubble("Him", [message.message], message.date);
this._add_bubble(this.user, [message.message], message.date);
},
send_message: function(e) {
if(e && e.which !== 13) {
@ -285,14 +286,14 @@ openerp.web_im = function(instance) {
}
var mes = this.$("input").val();
this.$("input").val("");
this._add_bubble("Me", [mes], instance.web.datetime_to_str(new Date()));
this._add_bubble(this.user, [mes], instance.web.datetime_to_str(new Date()));
var model = new instance.web.Model("im.message");
model.call("post", [mes, this.user.get('id')], {context: new instance.web.CompoundContext()});
},
_add_bubble: function(name, items, date) {
_add_bubble: function(user, items, date) {
date = instance.web.str_to_datetime(date);
date = date.toString(Date.CultureInfo.formatPatterns.shortDate + " " + Date.CultureInfo.formatPatterns.shortTime);
var bubble = QWeb.render("Conversation.bubble", {"items": items, "name": name, "time": date});
var bubble = QWeb.render("Conversation.bubble", {"items": items, "user": user, "time": date});
$(this.$(".oe_im_chatview_content").children()[0]).append($(bubble));
this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
},

6
addons/web_im/static/src/xml/im.xml
View File

@ -21,7 +21,7 @@
<t t-name="UserWidget">
<div class="oe_im_user">
<span class="oe_im_user_clip">
<img t-att-src='_s + "/web_im/static/src/img/avatar/avatar.jpeg"' class="oe_im_user_avatar"/>
<img t-att-src='widget.user.get("image_url")' class="oe_im_user_avatar"/>
</span>
<span class="oe_im_user_name"><t t-esc="widget.user.get('name')"/></span>
</div>
@ -46,9 +46,9 @@
<t t-name="Conversation.bubble">
<div class="oe_im_chatview_bubble">
<div class="oe_im_chatview_clip">
<img class="oe_im_chatview_avatar" t-att-src='_s + "/web_im/static/src/img/avatar/avatar.jpeg"'/>
<img class="oe_im_chatview_avatar" t-att-src='user.get("image_url")'/>
</div>
<div class="oe_im_chatview_from"><t t-esc="name"/></div>
<div class="oe_im_chatview_from"><t t-esc="user.get('name')"/></div>
<div class="oe_im_chatview_bubble_list">
<t t-foreach="items" t-as="item">
<div class="oe_im_chatview_bubble_item"><t t-esc="item"/></div>