Merge lp:~openerp-dev/openobject-client-web/6.0-opw-591397-xal into lp:openobject-client-web

[Xavier ALT]

Hi,

This fixes multiple things:

- List should not fetch any data in grouped mode - this is handled by Listgroup and MultipleGroup themself (using read_group).
  => This effectively fix some performance problem cause by reading all records (limit = -1 in grouped mode).

- When having 'search_default_FILTERNAME' in context, even when user uncheck this filter 'FILTERNAME' the list was still considering this filter groupby and domain.

- When having 'group_by_no_leaf' in context and no grouping criteria the list was showing 'row expand' which is wrong.

Regards,
Xavier

Unmerged revisions

4915. By Xavier ALT on 2013-05-07

[FIX] list: prevent List from fetching unnecessary data in grouped mode - this is handled by Listgroup and MultipleGroup themselve

4914. By Xavier ALT on 2013-05-07

[FIX] list: when view has 'group_by_no_leaf' in context and no grouping key - the view was badly showing row expand

4913. By Xavier ALT on 2013-05-07

[FIX] search view: fix filter no considering user choice when filter is active by default (considering the context)

  - If filter is active by default (search_default_FILTERNAME) it's domain and
    context was wrongly added if user manually uncheck it (search_data = {FILTERNAME: 0}).

    We now consider filter domain + context depending on 'def_checked' value - which
    respect both default value and user choice.

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2012-11-15 12:41:38 +0000
+++ addons/openerp/widgets/listgrid.py	2013-05-07 08:24:26 +0000
@@ -265,7 +265,7 @@
         if ids and not isinstance(ids, (list, tuple)):
             ids = [ids]
 
-        if ids and len(ids) > 0:
+        if ids and len(ids) > 0 and not kw.get('__no_data_fetch'):
 
             ctx = rpc.session.context.copy()
             ctx.update(context)
@@ -291,7 +291,7 @@
                 # 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', []):
+        elif kw.get('default_data', []) and not kw.get('__no_data_fetch'):
             data = kw['default_data']
 
         self.values = copy.deepcopy(data)
 
=== modified file 'addons/openerp/widgets/listgroup.py'
--- addons/openerp/widgets/listgroup.py	2012-07-30 11:08:14 +0000
+++ addons/openerp/widgets/listgroup.py	2013-05-07 08:24:26 +0000
@@ -186,14 +186,17 @@
 
         self.context.update(rpc.session.context.copy())
 
-        if self.group_by_no_leaf:
+        extra_args = {}
+
+        if self.group_by_ctx or self.group_by_no_leaf:
             self.limit = -1
+            extra_args['__no_data_fetch'] = True
 
         super(ListGroup, self).__init__(
             name=name, model=model, view=view, ids=self.ids, domain=self.domain,
             context=self.context, limit=self.limit, count=self.count,
             offset=self.offset, editable=self.editable,
-            selectable=self.selectable)
+            selectable=self.selectable, **extra_args)
 
         if self.group_by_ctx:
             self.context['group_by'] = self.group_by_ctx
@@ -235,6 +238,7 @@
     def __init__(self, name, model, view, ids=[], domain=[], parent_group=None, group_level=0, groups = [], context={}, **kw):
         self.context = context or {}
         self.domain = domain or []
+        self.group_by_no_leaf = self.context.get('group_by_no_leaf', 0)
 
         self.selectable = kw.get('selectable', 0)
         self.editable = kw.get('editable', False)
@@ -276,13 +280,17 @@
         fields = view['fields']
 
         self.grp_records = []
+        extra_args = {}
+
+        if self.group_by_ctx or self.group_by_no_leaf:
+            self.limit = -1
+            extra_args['__no_data_fetch'] = True
+
         super(MultipleGroup, self).__init__(
             name=name, model=model, view=view, ids=self.ids, domain=self.domain,
             parent_group=parent_group, group_level=group_level, groups=groups, context=self.context, limit=self.limit,
             count=self.count,offset=self.offset, editable=self.editable,
-            selectable=self.selectable, sort_order=sort_order, sort_key=sort_key)
-
-        self.group_by_no_leaf = self.context.get('group_by_no_leaf', 0)
+            selectable=self.selectable, sort_order=sort_order, sort_key=sort_key, **extra_args)
 
         self.group_by_ctx, self.hiddens, self.headers = parse(self.group_by_ctx, self.hiddens, self.headers, self.group_level, groups)
 
 
=== modified file 'addons/openerp/widgets/search.py'
--- addons/openerp/widgets/search.py	2012-07-27 12:12:02 +0000
+++ addons/openerp/widgets/search.py	2013-05-07 08:24:26 +0000
@@ -349,9 +349,10 @@
                     attrs['filter_status'] = values['filter_status']
 
                 v = Filter(**attrs)
-                if v.groupcontext and v.groupcontext not in self.groupby:
-                    self.groupby.append(v.groupcontext)
-                self.listof_domain.extend(i for i in v.global_domain if not i in self.listof_domain)
+                if v.def_checked:
+                    if v.groupcontext and v.groupcontext not in self.groupby:
+                        self.groupby.append(v.groupcontext)
+                    self.listof_domain.extend(i for i in v.global_domain if not i in self.listof_domain)
                 filters_run.append(v)
 
             elif node.localName == 'field':
@@ -470,10 +471,11 @@
                             filter_field.onchange = None
                             filter_field.callback = None
 
-                            if filter_field.groupcontext and filter_field.groupcontext not in self.groupby:
-                                self.groupby.append(filter_field.groupcontext)
-                            self.listof_domain.extend(i for i in filter_field.global_domain
-                                                        if i not in self.listof_domain)
+                            if filter_field.def_checked:
+                                if filter_field.groupcontext and filter_field.groupcontext not in self.groupby:
+                                    self.groupby.append(filter_field.groupcontext)
+                                self.listof_domain.extend(i for i in filter_field.global_domain
+                                                            if i not in self.listof_domain)
                             field.filters.append(filter_field)
         if filters_run:
             views.append(FiltersGroup(children=filters_run))
 
=== modified file 'addons/openerp/widgets/templates/listgrid/listgroup.mako'
--- addons/openerp/widgets/templates/listgrid/listgroup.mako	2012-07-18 09:35:52 +0000
+++ addons/openerp/widgets/templates/listgrid/listgroup.mako	2013-05-07 08:24:26 +0000
@@ -57,7 +57,7 @@
 
                             % if len(group_by_ctx) == 1 and group_by_no_leaf:
                                 <td class="grid-cell"></td>
-                            % elif len(group_by_ctx) >= 0:
+                            % elif len(group_by_ctx) >= 1:
 	                            <td class="grid-cell group-expand"
 	                                onclick="new ListView('${name}').group_by('${grp_row.get('group_by_id')}', '${grp_row.get('groups_id')}', '${group_by_no_leaf}', this);">
 	                            </td>