[MERGE] forward port of branch saas-11 up to 7153077

2 files changed, 9 insertions, 3 deletions

diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index 27daf2ea831..aad32394ff1 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -282,6 +282,9 @@ function make_channel (data, options) {
     } else if ('anonymous_name' in data) {
         channel.name = data.anonymous_name;
     }
+    if (data.last_message_date) {
+        channel.last_message_date = moment(time.str_to_datetime(data.last_message_date));
+    }
     channel.is_chat = !channel.type.match(/^(public|private|static)$/);
     if (data.message_unread_counter) {
         update_channel_unread_counter(channel, data.message_unread_counter);
diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js
index f090cb5a4a6..f94997c946c 100644
--- a/addons/mail/static/src/js/client_action.js
+++ b/addons/mail/static/src/js/client_action.js
@@ -300,12 +300,12 @@ var ChatAction = Widget.extend(ControlPanelMixin, {
 
     render_sidebar: function () {
         var self = this;
-        var $sidebar = $(QWeb.render("mail.chat.Sidebar", {
+        var $sidebar = this._render_sidebar({
             active_channel_id: this.channel ? this.channel.id: undefined,
             channels: chat_manager.get_channels(),
             needaction_counter: chat_manager.get_needaction_counter(),
             starred_counter: chat_manager.get_starred_counter(),
-        }));
+        });
         this.$(".o_mail_chat_sidebar").html($sidebar.contents());
 
         this.$('.o_mail_add_channel[data-type=public]').find("input").autocomplete({
@@ -364,6 +364,10 @@ var ChatAction = Widget.extend(ControlPanelMixin, {
         });
     },
 
+    _render_sidebar: function (options) {
+        return $(QWeb.render("mail.chat.Sidebar", options));
+    },
+
     render_snackbar: function (template, context, timeout) {
         if (this.$snackbar) {
             this.$snackbar.remove();
@@ -657,7 +661,6 @@ var ChatAction = Widget.extend(ControlPanelMixin, {
             target: 'current'
         });
     },
-            context: "{'default_no_auto_thread': False}",
 });