Merge lp:~openerp-dev/openobject-client-web/6.0-opw-578685-msh into lp:openobject-client-web

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of many2many pager inconsistent behaviour.

Demo:- Create some more records in many2many like in partner category I have 500 records and limit is 50, so now to check inconsistency just click on next paging records in 2/3 times you will get the issue.

when you click next records 2/3 times the count is shown proper but the record will not be appear.

Reason :- The issue is generated due to https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-383682-msh/+merge/93358 because ids were assigned filtered ids based on current.offset and current.limit due to which when next page is opened so we will get only filtered ids in ids.

Thanks.

[lp:~openerp-dev/openobject-client-web/6.0-opw-578685-msh]

4880. By Xavier ALT on 2012-10-02

[FIX] web: multiple fix on many2many

4881. By Xavier ALT on 2012-10-09

[FIX] many2many: prefilter data only when view is not using field sum='' attribute

=== modified file 'addons/openerp/widgets/form/_m2m.py'
--- addons/openerp/widgets/form/_m2m.py	2012-06-08 16:55:21 +0000
+++ addons/openerp/widgets/form/_m2m.py	2012-10-09 08:04:24 +0000
@@ -102,16 +102,11 @@
         if isinstance(ids, tuple):
             ids = list(ids)
 
-        if ids and current.limit != -1 and not params.sort_key:
-            ids = ids[current.offset: current.offset+current.limit]
-        
         if self.name == params.source and params.sort_key and ids:
+            # reorder ids based on supplier criteria (sort_key, sort_order)
             domain = current.domain or []
             domain.append(('id','in',ids))
-            limit = current.limit
-            if current.limit == -1:
-                limit = 0
-            ids = rpc.RPCProxy(self.model).search(domain, current.offset, limit, params.sort_key+ ' '+params.sort_order, current.context)
+            ids = rpc.RPCProxy(self.model).search(domain, 0, 0, params.sort_key+ ' '+params.sort_order, current.context)
             id = ids[0]
 
         if current.view_mode: view_mode = current.view_mode

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2012-07-31 09:35:50 +0000
+++ addons/openerp/widgets/listgrid.py	2012-10-09 08:04:24 +0000
@@ -253,6 +253,12 @@
             else:
                 self.count = proxy.search_count(search_param, context)
 
+        if not default_data and self.m2m and not self.view_using_sum_attrs(root):
+            # for many2many we limits 'ids' to be readed only when view is not
+            # using sum, otherwise we need to get all 'ids' to compute sums correctly
+            if ids and self.limit not in (0, -1):
+                ids = self.ids[self.offset:self.offset+self.limit]
+
         self.data_dict = {}
         data = []
 
@@ -281,7 +287,10 @@
             for item in data:
                 self.data_dict[item['id']] = item.copy()
 
-            self.ids = ids
+            if not self.m2m:
+                # update active 'ids' except for many2many which need to get
+                # all known ids for update to work correctly
+                self.ids = ids
         elif kw.get('default_data', []):
             data = kw['default_data']
 
@@ -419,6 +428,16 @@
 
         return super(List, self).display(value, **params)
 
+    def view_using_sum_attrs(self, root):
+        """ detect if supplied view is using <field sum=""/>
+
+        @return: True/False
+        """
+        for node in root.childNodes:
+            if node.nodeName == 'field' and 'attrs' in node_attributes(node):
+                return True
+        return False
+
     def parse(self, root, fields, data=[]):
         """Parse the given node to generate valid list headers.