Merge lp:~openerp-dev/openobject-addons/trunk-scroll-load-chatter-2-aja into lp:openobject-addons

[ajay javiya (OpenERP)]

Hello,
ADD:
 -> load a chatter messages on scroll.
 -> Test case for chatter message on scroll.
 -> Changelog.
Thank You.

[lp:~openerp-dev/openobject-addons/trunk-scroll-load-chatter-2-aja]

9027. By ajay javiya (OpenERP) on 2013-12-27

[REM]: unwanted code

9028. By ajay javiya (OpenERP) on 2013-12-27

[MERGE]: with trunk

9029. By ajay javiya (OpenERP) on 2014-02-17

[MERGE]: with trunk

9030. By ajay javiya (OpenERP) on 2014-02-20

[MERGE] : with trunk

9031. By Mahendra Barad(OpenERP) on 2014-02-21

[IMP]display no of message limit if message is more than limit then display show more after display limited message

9032. By ajay javiya (OpenERP) on 2014-02-25

[MERGE] : with trunk

9033. By ajay javiya (OpenERP) on 2014-02-25

[FIX] : number of message display on wall wrong

9034. By Chirag Dodiya(OpenERP) on 2014-03-13

[MRG]Merge with lp:openobject-addons

9035. By Amit Vora(OpenERP) on 2014-03-13

[MERGE] merge with main branch

9036. By Chirag Dodiya(OpenERP) on 2014-03-20

[MRG]Merge with lp:openobject-addons

9037. By ajay javiya (OpenERP) on 2014-03-31

[MERGE] : with trunk

9038. By ajay javiya (OpenERP) on 2014-04-23

[MERGE] : with trunk

9039. By ajay javiya (OpenERP) on 2014-04-24

[MERGE] : withn trunk

9040. By ajay javiya (OpenERP) on 2014-04-24

[FIX] :message are misplaced in wall on scroll

9041. By ajay javiya (OpenERP) on 2014-04-25

[FIX] : In chatter 'send message' link misplaced

9042. By ajay javiya (OpenERP) on 2014-04-25

[MERGE] : with trunk

Unmerged revisions

9042. By ajay javiya (OpenERP) on 2014-04-25

[MERGE] : with trunk

9041. By ajay javiya (OpenERP) on 2014-04-25

[FIX] : In chatter 'send message' link misplaced

9040. By ajay javiya (OpenERP) on 2014-04-24

[FIX] :message are misplaced in wall on scroll

9039. By ajay javiya (OpenERP) on 2014-04-24

[MERGE] : withn trunk

9038. By ajay javiya (OpenERP) on 2014-04-23

[MERGE] : with trunk

9037. By ajay javiya (OpenERP) on 2014-03-31

[MERGE] : with trunk

9036. By Chirag Dodiya(OpenERP) on 2014-03-20

[MRG]Merge with lp:openobject-addons

9035. By Amit Vora(OpenERP) on 2014-03-13

[MERGE] merge with main branch

9034. By Chirag Dodiya(OpenERP) on 2014-03-13

[MRG]Merge with lp:openobject-addons

9033. By ajay javiya (OpenERP) on 2014-02-25

[FIX] : number of message display on wall wrong

=== modified file 'mail/doc/mail_message.rst'
--- mail/doc/mail_message.rst	2013-02-05 15:55:56 +0000
+++ mail/doc/mail_message.rst	2014-04-25 10:31:15 +0000
@@ -109,3 +109,7 @@
    expandable messages. The expandable messages contain the domain to expand.
  - ``check_access_rule`` :
    Overwrite the initial message for this model.
+ - ``_message_read_add_expandables`` :
+   add paremeter max_limit ,telling we have overlimit messages.
+ - ``_get_expandable`` :
+   add parameters limit.

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2014-04-15 14:49:43 +0000
+++ mail/mail_message.py	2014-04-25 10:31:15 +0000
@@ -69,7 +69,7 @@
     _order = 'id desc'
     _rec_name = 'record_name'
 
-    _message_read_limit = 30
+    _message_read_limit = 50
     _message_read_fields = ['id', 'parent_id', 'model', 'res_id', 'body', 'subject', 'date', 'to_read', 'email_from',
         'type', 'vote_user_ids', 'attachment_ids', 'author_id', 'partner_ids', 'record_name']
     _message_record_name_length = 18
@@ -409,7 +409,7 @@
             }
 
     def _message_read_add_expandables(self, cr, uid, messages, message_tree, parent_tree,
-            message_unload_ids=[], thread_level=0, domain=[], parent_id=False, context=None):
+            message_unload_ids=[], thread_level=0, domain=[], parent_id=False, max_limit=False, context=None):
         """ Create expandables for message_read, to load new messages.
             1. get the expandable for new threads
                 if display is flat (thread_level == 0):
@@ -432,13 +432,14 @@
                 to load
             :return bool: True
         """
-        def _get_expandable(domain, message_nb, parent_id, max_limit):
+        def _get_expandable(domain, message_nb, parent_id, limit, max_limit):
             return {
                 'domain': domain,
                 'nb_messages': message_nb,
                 'type': 'expandable',
                 'parent_id': parent_id,
                 'max_limit':  max_limit,
+                'limit': limit,
             }
 
         if not messages:
@@ -454,10 +455,10 @@
         if ids:
             # inside a thread: prepend
             if parent_id:
-                messages.insert(0, _get_expandable(exp_domain, -1, parent_id, True))
+                messages.insert(0, _get_expandable(exp_domain, -1, parent_id, self._message_read_limit, max_limit))
             # new threads: append
             else:
-                messages.append(_get_expandable(exp_domain, -1, parent_id, True))
+                messages.append(_get_expandable(exp_domain, -1, parent_id, self._message_read_limit, max_limit))
 
         # 2. get the expandables for new messages inside threads if display is not flat
         if thread_level == 0:
@@ -488,7 +489,7 @@
                     exp_domain = [('id', '>=', id_min), ('id', '<=', id_max), ('id', 'child_of', message_id)]
                     idx = [msg.get('id') for msg in messages].index(child_id) + 1
                     # messages.append(_get_expandable(exp_domain, nb, message_id, False))
-                    messages.insert(idx, _get_expandable(exp_domain, nb, message_id, False))
+                    messages.insert(idx, _get_expandable(exp_domain, nb, message_id, False, False))
                     id_min, id_max, nb = max(child_ids), 0, 0
                 else:
                     id_min, id_max, nb = max(child_ids), 0, 0
@@ -496,7 +497,7 @@
                 exp_domain = [('id', '>=', id_min), ('id', '<=', id_max), ('id', 'child_of', message_id)]
                 idx = [msg.get('id') for msg in messages].index(message_id) + 1
                 # messages.append(_get_expandable(exp_domain, nb, message_id, id_min))
-                messages.insert(idx, _get_expandable(exp_domain, nb, message_id, False))
+                messages.insert(idx, _get_expandable(exp_domain, nb, message_id, False, False))
 
         return True
 
@@ -534,10 +535,14 @@
         message_tree = {}
         message_list = []
         parent_tree = {}
-
+        max_limit = False
         # no specific IDS given: fetch messages according to the domain, add their parents if uid has access to
         if ids is None:
-            ids = self.search(cr, uid, domain, context=context, limit=limit)
+            ids = self.search(cr, uid, domain, context=context)
+        if ids:
+            if len(ids) > limit:
+                max_limit = True
+            ids = limit and ids[:limit] or ids
 
         # fetch parent if threaded, sort messages
         for message in self.browse(cr, uid, ids, context=context):
@@ -575,7 +580,7 @@
         # get the child expandable messages for the tree
         self._message_read_dict_postprocess(cr, uid, message_list, message_tree, context=context)
         self._message_read_add_expandables(cr, uid, message_list, message_tree, parent_tree,
-            thread_level=thread_level, message_unload_ids=message_unload_ids, domain=domain, parent_id=parent_id, context=context)
+            thread_level=thread_level, message_unload_ids=message_unload_ids, domain=domain, parent_id=parent_id, max_limit=max_limit, context=context)
         return message_list
 
     #------------------------------------------------------

=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js	2014-03-25 14:25:35 +0000
+++ mail/static/src/js/mail.js	2014-04-25 10:31:15 +0000
@@ -694,7 +694,7 @@
                     var thread = thread.parent_message.parent_thread;
                 }
                 // create object and attach to the thread object
-                thread.message_fetch([["id", "=", message_id]], false, [message_id], function (arg, data) {
+                thread.message_fetch([["id", "=", message_id]], false, [message_id], false, function (arg, data) {
                     var message = thread.create_message_object( data.slice(-1)[0] );
                     // insert the message on dom
                     thread.insert_message( message, root ? undefined : self.$el, root );
@@ -835,6 +835,7 @@
             this.type = 'expandable';
             this.max_limit = datasets.max_limit;
             this.nb_messages = datasets.nb_messages;
+            this.limit = datasets.limit || datasets.nb_messages;
             this.flag_used = false;
         },
         
@@ -877,8 +878,9 @@
             var self = this;
 
             // read messages
-            self.parent_thread.message_fetch(this.domain, this.context, false, function (arg, data) {
+            self.parent_thread.message_fetch(this.domain, this.context, false, this.limit, function (arg, data) {
                 self.id = false;
+                data = self.options.display_reverse ? data.reverse() : data //when display_reverse is true then show msg in last to first seq.
                 // insert the message on dom after this message
                 self.parent_thread.switch_new_message( data, self.$el );
                 self.animated_destroy(200);
@@ -1184,7 +1186,6 @@
             this.partner_ids = datasets.partner_ids;
             this.messages = [];
             this.options.flat_mode = (this.options.display_indented_thread - this.thread_level > 0);
-
             // object compose message
             this.compose_message = false;
 
@@ -1372,7 +1373,7 @@
          * @param {Object} replace_context: added to this.context
          * @param {Array} ids read (if the are some ids, the method don't use the domain)
          */
-        message_fetch: function (replace_domain, replace_context, ids, callback) {
+        message_fetch: function (replace_domain, replace_context, ids, limit, callback) {
             return this.ds_message.call('message_read', [
                     // ids force to read
                     ids === false ? undefined : ids, 
@@ -1385,7 +1386,8 @@
                     // context + additional
                     (replace_context ? replace_context : this.context), 
                     // parent_id
-                    this.context.default_parent_id || undefined
+                    this.context.default_parent_id || undefined,
+                    limit=limit,
                 ]).done(callback ? _.bind(callback, this, arguments) : this.proxy('switch_new_message')
                 ).done(this.proxy('message_fetch_set_read'));
         },
@@ -1462,9 +1464,10 @@
             if (dom_insert_after && dom_insert_after.parent()[0] == self.$el[0]) {
                 message.insertAfter(dom_insert_after);
             } else if (prepend) {
-                message.prependTo(self.$el);
+                message.prependTo(self.options.view_mailbox ? self.$el.parent() : self.$el);
             } else {
-                message.appendTo(self.$el);
+                //in wall thread must be add to parent thread
+                message.appendTo(self.options.view_mailbox ? self.$el.parent() : self.$el);
             }
             message.$el.hide().fadeIn(500);
 
@@ -1702,7 +1705,7 @@
                 this.thread.compose_message.do_show_compact();
             }
 
-            this.thread.message_fetch(null, null, this.action.params.message_ids);
+            this.thread.message_fetch(null, null, this.action.params.message_ids, false);
 
         },
 
@@ -1741,6 +1744,7 @@
                 'show_record_name': false,
                 'show_compact_message': 1,
                 'display_log_button' : true,
+                'display_reverse' : true,
             }, this.node.params);
             if (this.node.attrs.placeholder) {
                 this.node.params.compose_placeholder = this.node.attrs.placeholder;
@@ -1865,6 +1869,7 @@
                 'show_compact_message': this.action.params.view_mailbox ? false : 1,
                 'view_inbox': false,
                 'emails_from_on_composer': false,
+                'display_reverse' : false,
             }, this.action.params);
         },
 

=== modified file 'mail/tests/test_message_read.py'
--- mail/tests/test_message_read.py	2013-10-27 12:31:04 +0000
+++ mail/tests/test_message_read.py	2014-04-25 10:31:15 +0000
@@ -187,3 +187,33 @@
         self.assertEqual(len(read_msg_list), 9, 'message_read on Pigs should return 9 messages and 0 expandable')
         self.assertEqual([msg_id8, msg_id7, msg_id6, msg_id5, msg_id4, msg_id3, msg_id2, msg_id1, msg_id0], read_msg_ids,
             'message_read, More on flat, should return all remaning messages')
+
+    def test_10_message_read(self):
+        """ Tests for message_read onscroll. """
+        cr, uid, user_admin, user_raoul, group_pigs = self.cr, self.uid, self.user_admin, self.user_raoul, self.group_pigs
+        msg_ids = []
+        pigs_domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]
+        # Post 27 msg
+        for msg in range(0,27):
+            msg_ids.append(self.group_pigs.message_post(body='test %s' % msg, subtype='mt_comment'))
+        # Test : message_read with limit 10
+        read_msg_list = self.mail_message.message_read(cr, uid,domain=pigs_domain, limit=10)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        self.assertEqual(len(read_msg_list), 11, 'message_read on Pigs should return 10 messages and 1 expandable')
+        new_threads_exp, new_msg_exp = None, None
+        for msg in read_msg_list:
+            if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('max_limit'):
+                new_threads_exp = msg
+        # Read 10 msg in second thread
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=new_threads_exp['domain'], limit=10)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        self.assertEqual(len(read_msg_list), 11, 'message_read on Pigs should return 10 messages and 1 expandable')
+        new_threads_exp, new_msg_exp = None, None
+        for msg in read_msg_list:
+            if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('max_limit'):
+                new_threads_exp = msg
+        # Read all remaining 7 msg in third thread
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=new_threads_exp['domain'], limit=10)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        self.assertEqual(len(read_msg_list), 7, 'message_read on Pigs should return 7 messages and 0 expandable')
+