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

[ajay javiya (OpenERP)]

Hello,
 - ADD : load a chatter messages on scroll.
Thank You.

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

8984. By ajay javiya (OpenERP) on 2013-11-20

[ADD]: change log and set default message_read_limit = 50

8985. By ajay javiya (OpenERP) on 2013-11-22

[MERGE]: sync with trunk

8986. By ajay javiya (OpenERP) on 2013-11-25

[MERGE] : with trunk

8987. By ajay javiya (OpenERP) on 2013-11-25

[ADD]: limit and offset from client

8988. By ajay javiya (OpenERP) on 2013-11-25

[REV]: unwanted code

Unmerged revisions

8988. By ajay javiya (OpenERP) on 2013-11-25

[REV]: unwanted code

8987. By ajay javiya (OpenERP) on 2013-11-25

[ADD]: limit and offset from client

8986. By ajay javiya (OpenERP) on 2013-11-25

[MERGE] : with trunk

8985. By ajay javiya (OpenERP) on 2013-11-22

[MERGE]: sync with trunk

8984. By ajay javiya (OpenERP) on 2013-11-20

[ADD]: change log and set default message_read_limit = 50

8983. By ajay javiya (OpenERP) on 2013-11-19

[ADD]: test case

8982. By ajay javiya (OpenERP) on 2013-11-19

[IMP]: add option display_reverse to show message from first to last sequence, true for chatter and false for wall

8981. By ajay javiya (OpenERP) on 2013-11-18

[IMP]: Display record on scroll in chatter

=== modified file 'mail/doc/mail_message.rst'
--- mail/doc/mail_message.rst	2013-02-05 15:55:56 +0000
+++ mail/doc/mail_message.rst	2013-11-25 13:13:54 +0000
@@ -103,9 +103,13 @@
 +++++++
 
  - ``message_read`` :
-   Value: ids, domain, message_unload_ids, thread_level, context, parent_id, limit
+   Value: ids, domain, message_unload_ids, thread_level, context, parent_id, limit, offset
    Return: List of dictinary of message. All message is sent with their parented messages and
    sort by id. The messages that the user can read but not in his search, are group in
    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 over_limit ,telling we have overlimit messages.
+ - ``_get_expandable`` :
+   add parameters limit and offset.

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2013-09-19 14:23:38 +0000
+++ mail/mail_message.py	2013-11-25 13:13:54 +0000
@@ -69,7 +69,8 @@
     _order = 'id desc'
     _rec_name = 'record_name'
 
-    _message_read_limit = 30
+    _message_read_limit = 50
+    _message_read_offset = 0
     _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
@@ -432,7 +433,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):
@@ -455,19 +456,20 @@
                 to load
             :return bool: True
         """
-        def _get_expandable(domain, message_nb, parent_id, max_limit):
+        def _get_expandable(domain, message_nb, parent_id, limit, offset, max_limit):
             return {
                 'domain': domain,
                 'nb_messages': message_nb,
                 'type': 'expandable',
                 'parent_id': parent_id,
-                'max_limit':  max_limit,
+                'max_limit': max_limit,
+                'limit':  limit,
+                'offset': offset,
             }
 
         if not messages:
             return True
         message_ids = sorted(message_tree.keys())
-
         # 1. get the expandable for new threads
         if thread_level == 0:
             exp_domain = domain + [('id', '<', min(message_unload_ids + message_ids))]
@@ -477,10 +479,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, self._message_read_offset, 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, self._message_read_offset, max_limit))
 
         # 2. get the expandables for new messages inside threads if display is not flat
         if thread_level == 0:
@@ -511,7 +513,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, 0, False))
                     id_min, id_max, nb = max(child_ids), 0, 0
                 else:
                     id_min, id_max, nb = max(child_ids), 0, 0
@@ -519,12 +521,12 @@
                 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, 0, False))
 
         return True
 
     def message_read(self, cr, uid, ids=None, domain=None, message_unload_ids=None,
-                        thread_level=0, context=None, parent_id=False, limit=None):
+                        thread_level=0, context=None, parent_id=False, limit=None, offset=0):
         """ Read messages from mail.message, and get back a list of structured
             messages to be displayed as discussion threads. If IDs is set,
             fetch these records. Otherwise use the domain to fetch messages.
@@ -554,14 +556,18 @@
         if message_unload_ids:
             domain += [('id', 'not in', message_unload_ids)]
         limit = limit or self._message_read_limit
+        offset = offset or self._message_read_offset
         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[offset:offset+limit] or ids[offset:]
         # fetch parent if threaded, sort messages
         for message in self.browse(cr, uid, ids, context=context):
             message_id = message.id
@@ -589,16 +595,15 @@
             for key, message_id_list in parent_tree.iteritems():
                 message_id_list.sort(key=lambda item: item['id'])
                 message_id_list.insert(0, self._message_read_dict(cr, uid, message_tree[key], context=context))
-
         # create final ordered message_list based on parent_tree
         parent_list = parent_tree.items()
         parent_list = sorted(parent_list, key=lambda item: max([msg.get('id') for msg in item[1]]) if item[1] else item[0], reverse=True)
         message_list = [message for (key, msg_list) in parent_list for message in msg_list]
-
         # 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/mail_thread.py'
--- mail/mail_thread.py	2013-10-18 14:49:24 +0000
+++ mail/mail_thread.py	2013-11-25 13:13:54 +0000
@@ -1462,7 +1462,6 @@
         """ Add partners to the records followers. """
         mail_followers_obj = self.pool.get('mail.followers')
         subtype_obj = self.pool.get('mail.message.subtype')
-
         user_pid = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         if set(partner_ids) == set([user_pid]):
             try:

=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js	2013-10-09 18:03:37 +0000
+++ mail/static/src/js/mail.js	2013-11-25 13:13:54 +0000
@@ -929,8 +929,10 @@
             var self = this;
 
             // read messages
+            
             self.parent_thread.message_fetch(this.domain, this.context, false, 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);
@@ -1221,7 +1223,6 @@
             this.MailWidget = parent instanceof mail.Widget ? parent : false;
             this.domain = options.domain || [];
             this.context = _.extend(options.context || {});
-
             this.options = options.options;
             this.options.root_thread = (options.options.root_thread != undefined ? options.options.root_thread : this);
             this.options.show_compose_message = this.options.show_compose_message && !this.thread_level;
@@ -1244,7 +1245,8 @@
             this.partner_ids = datasets.partner_ids;
             this.messages = [];
             this.options.flat_mode = (this.options.display_indented_thread - this.thread_level > 0);
-
+            this.limit = 50;
+            this.offset = 0;
             // object compose message
             this.compose_message = false;
 
@@ -1445,7 +1447,9 @@
                     // context + additional
                     (replace_context ? replace_context : this.context), 
                     // parent_id
-                    this.context.default_parent_id || undefined
+                    this.context.default_parent_id || undefined,
+                    this.limit,
+                    this.offset
                 ]).done(callback ? _.bind(callback, this, arguments) : this.proxy('switch_new_message')
                 ).done(this.proxy('message_fetch_set_read'));
         },
@@ -1800,6 +1804,7 @@
                 'read_action': 'unread',
                 'show_record_name': false,
                 'show_compact_message': 1,
+                'display_reverse' : true,
             }, this.node.params);
 
             if (this.node.attrs.placeholder) {
@@ -1923,6 +1928,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-08-27 13:30:58 +0000
+++ mail/tests/test_message_read.py	2013-11-25 13:13:54 +0000
@@ -187,3 +187,34 @@
         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 . """
+        cr, uid, user_admin, user_raoul, group_pigs = self.cr, self.uid, self.user_admin, self.user_raoul, self.group_pigs
+
+        msg_id0 = self.group_pigs.message_post(body='test 1', subtype='mt_comment')
+        msg_id1 = self.group_pigs.message_post(body='test 2', subtype='mt_comment')
+        msg_id2 = self.group_pigs.message_post(body='test 3', subtype='mt_comment')
+        msg_id3 = self.group_pigs.message_post(body='test 4', subtype='mt_comment')
+        msg_id4 = self.group_pigs.message_post(body='test 5', subtype='mt_comment')
+        msg_id5 = self.group_pigs.message_post(body='test 6', subtype='mt_comment')
+        msg_id6 = self.group_pigs.message_post(body='test 7', subtype='mt_comment')
+        msg_id7 = self.group_pigs.message_post(body='test 8', subtype='mt_comment')
+        msg_id8 = self.group_pigs.message_post(body='test 9', subtype='mt_comment')
+        msg_id9 = self.group_pigs.message_post(body='test 10', subtype='mt_comment')
+        msg_id10 = self.group_pigs.message_post(body='test 11', subtype='mt_comment')
+        msg_id11 = self.group_pigs.message_post(body='test 1', subtype='mt_comment')
+        msg_id12 = self.group_pigs.message_post(body='test 2', subtype='mt_comment')
+        msg_id13 = self.group_pigs.message_post(body='test 3', subtype='mt_comment')
+        msg_id14 = self.group_pigs.message_post(body='test 4', subtype='mt_comment')
+        msg_id15 = self.group_pigs.message_post(body='test 6', subtype='mt_comment')
+        msg_id16 = self.group_pigs.message_post(body='test 7', subtype='mt_comment')
+        msg_id17 = self.group_pigs.message_post(body='test 8', subtype='mt_comment')
+        msg_id18 = self.group_pigs.message_post(body='test 9', subtype='mt_comment')
+        msg_id19 = self.group_pigs.message_post(body='test 10', subtype='mt_comment')
+        msg_id20 = self.group_pigs.message_post(body='test 11', subtype='mt_comment')
+
+        msg_ids = [msg_id20, msg_id19, msg_id18, msg_id17, msg_id16, msg_id15, msg_id14, msg_id13, msg_id12, msg_id11, msg_id10, msg_id9, msg_id8, msg_id7, msg_id6, msg_id5, msg_id4, msg_id3, msg_id2, msg_id1, msg_id0]
+        # Test : message_read with limit and offset
+        read_msg_list = self.mail_message.message_read(cr, uid,ids=msg_ids, limit=10, offset=0)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']