From df855499b2992d52c8ff0adf20281a39dbd9f8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 5 Apr 2012 13:34:19 +0200
Subject: [PATCH] [FIX] Thread widget: cleaned function calls (using
 this.proxy) to avoid asynchronous problems

bzr revid: tde@openerp.com-20120405113419-eov3xxq2a3vm0gpa
---
 addons/mail/static/src/js/mail.js | 33 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0899212d3cf..710c42e3618 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -581,15 +581,16 @@ openerp.mail = function(session) {
         init: function (parent, params) {
             this._super(parent);
             this.params = {};
-            this.params.limit = params.limit || 1;
+            this.params.limit = params.limit || 5;
             this.params.domain = params.domain || [];
             this.params.context = params.context || {};
-            this.params.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.params.search_view_id = params.search_view_id || false;
             this.params.thread_level = params.thread_level || 1;
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             this.display_show_more = true;
             this.thread_list = [];
+            this.search = {'domain': [], 'context': {}, 'groupby': {}}
+            this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
             // datasets
             this.ds_msg = new session.web.DataSet(this, 'mail.message');
             this.ds_groups = new session.web.DataSet(this, 'mail.group');
@@ -652,10 +653,10 @@ openerp.mail = function(session) {
                 contexts: contexts || [],
                 group_by_seq: groupbys || []
             }, function (results) {
-                //self.params.search['context'] = results.context;
-                //self.params.search['domain'] = results.domain;
-                //self.params.search['groupby'] = results.group_by;
-                return self.init_and_fetch_comments(self.params.limit, 0, results.domain, results.context);
+                self.search_results['context'] = results.context;
+                self.search_results['domain'] = results.domain;
+                self.search_results['groupby'] = results.group_by;
+                return self.init_and_fetch_comments();
             });
         },
 
@@ -666,13 +667,13 @@ openerp.mail = function(session) {
          * @param {Array} domain
          * @param {Array} context
          */
-        init_and_fetch_comments: function(limit, offset, domain, context) {
-            this.params.search['domain'] = _.union(this.params.domain, domain || []);
-            this.params.search['context'] = _.extend(this.params.context, context || {});
+        init_and_fetch_comments: function() {
+            this.search['domain'] = _.union(this.params.domain, this.search_results.domain);
+            this.search['context'] = _.extend(this.params.context, this.search_results.context);
             this.display_show_more = true;
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             this.$element.find('div.oe_mail_wall_threads').empty();
-            return this.fetch_comments(limit, offset);
+            return this.fetch_comments(this.params.limit, 0);
         },
 
         /**
@@ -684,10 +685,10 @@ openerp.mail = function(session) {
          */
         fetch_comments: function (limit, offset, additional_domain, additional_context) {
             var self = this;
-            if (additional_domain) var fetch_domain = this.params.search['domain'].concat(additional_domain);
-            else var fetch_domain = this.params.search['domain'];
-            if (additional_context) var fetch_context = _.extend(this.params.search['context'], additional_context);
-            else var fetch_context = this.params.search['context'];
+            if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
+            else var fetch_domain = this.search['domain'];
+            if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
+            else var fetch_context = this.search['context'];
             return this.ds_thread.call('get_pushed_messages', 
                 [[this.session.uid], (limit || 0), (offset || 0), fetch_domain, true, [], fetch_context]).then(this.proxy('display_comments'));
         },
@@ -722,6 +723,7 @@ openerp.mail = function(session) {
          */
         sort_comments: function(records) {
             tools_sort_comments(this.comments_structure, records, false);
+            console.log(this.comments_structure);
         },
 
         /**
@@ -758,8 +760,7 @@ openerp.mail = function(session) {
         /** Action: Posts a comment */
         do_comment: function () {
             var body_text = this.$element.find('textarea.oe_mail_wall_action_textarea').val();
-            return this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(
-                this.init_and_fetch_comments(this.params.limit, 0));
+            var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments'));
         },
     });
 };