diff --git a/addons/bus/bus.py b/addons/bus/bus.py index dc6ff6d7f1a..d3801743fdb 100644 --- a/addons/bus/bus.py +++ b/addons/bus/bus.py @@ -51,8 +51,8 @@ class ImBus(osv.Model): "channel" : json_dump(channel), "message" : json_dump(message) } - cr.commit() self.pool['bus.bus'].create(cr, openerp.SUPERUSER_ID, values) + cr.commit() if random.random() < 0.01: self.gc(cr, uid) if channels: diff --git a/addons/im_chat/im_chat.py b/addons/im_chat/im_chat.py index 3617962aa16..4ca27282c6b 100644 --- a/addons/im_chat/im_chat.py +++ b/addons/im_chat/im_chat.py @@ -136,7 +136,8 @@ class im_chat_session(osv.Model): if session_id: # get the image of the user res = self.pool["res.users"].read(cr, uid, [user_id], ["image_small"])[0] - image_b64 = res["image_small"] + if res["image_small"]: + image_b64 = res["image_small"] return image_b64 class im_chat_message(osv.Model): diff --git a/addons/im_chat/security/ir.model.access.csv b/addons/im_chat/security/ir.model.access.csv index a85541d1aa4..c1caaf14ce0 100644 --- a/addons/im_chat/security/ir.model.access.csv +++ b/addons/im_chat/security/ir.model.access.csv @@ -3,3 +3,7 @@ access_im_chat_message,im_chat.message,model_im_chat_message,base.group_user,1,0 access_im_chat_session,im_chat.session,model_im_chat_session,base.group_user,1,1,1,0 access_im_chat_conversation_state,im_chat.conversation_state,model_im_chat_conversation_state,base.group_user,1,1,1,0 access_im_chat_presence,im_chat.presence,model_im_chat_presence,base.group_user,1,1,1,1 +access_im_chat_message_portal,im_chat.message,model_im_chat_message,base.group_portal,1,0,1,0 +access_im_chat_session_portal,im_chat.session,model_im_chat_session,base.group_portal,1,1,1,0 +access_im_chat_conversation_state_portal,im_chat.conversation_state,model_im_chat_conversation_state,base.group_portal,1,1,1,0 +access_im_chat_presence_portal,im_chat.presence,model_im_chat_presence,base.group_portal,1,1,1,1 \ No newline at end of file diff --git a/addons/im_chat/static/src/js/im_chat.js b/addons/im_chat/static/src/js/im_chat.js index b08cd0d1e29..3ee54dbeddc 100644 --- a/addons/im_chat/static/src/js/im_chat.js +++ b/addons/im_chat/static/src/js/im_chat.js @@ -293,7 +293,7 @@ } m.message = self.escape_keep_url(m.message); m.message = self.smiley(m.message); - m.create_date = Date.parse(m.create_date).setTimezone("UTC").toString("yyyy-dd-MM HH:mm:ss"); + m.create_date = Date.parse(m.create_date).setTimezone("UTC").toString("yyyy-MM-dd HH:mm:ss"); return m; }); this.set("messages", _.sortBy(this.get("messages").concat(messages), function(m){ return m.id; })); @@ -528,6 +528,7 @@ }); }, switch_display: function() { + this.calc_box(); var fct = _.bind(function(place) { this.set("right_offset", place + this.$el.outerWidth()); }, this); diff --git a/addons/website_livechat/__openerp__.py b/addons/website_livechat/__openerp__.py index e41f2072a42..1e87f362778 100644 --- a/addons/website_livechat/__openerp__.py +++ b/addons/website_livechat/__openerp__.py @@ -13,6 +13,7 @@ For website built with Odoo CMS, this module include a chat button on your Websi 'installable': True, 'data': [ 'views/website_livechat.xml', - 'views/res_config.xml' + 'views/res_config.xml', + 'website_livechat_data.xml' ], } diff --git a/addons/website_livechat/website_livechat_data.xml b/addons/website_livechat/website_livechat_data.xml new file mode 100644 index 00000000000..55c59895664 --- /dev/null +++ b/addons/website_livechat/website_livechat_data.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file