Merge lp:~openerp-groupes/openobject-client-web/fix-unlimited-sorted-tfr into lp:~openerp-groupes/openobject-client-web/6.0

[tfr (Openerp)]

Unmerged revisions

4492. By tfr (Openerp) on 2011-11-25

[FIX] unlimited not sorted + refactor a little bit the code

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2011-03-29 15:51:28 +0000
+++ addons/openerp/widgets/listgrid.py	2011-11-25 11:01:36 +0000
@@ -148,17 +148,15 @@
         if not self.source:
             self.source = terp_params.get('_terp_source', None)
         if not default_data and not self.o2m and not self.m2m:
-            if self.limit > 0:
-                if self.sort_key:
-                    ids = proxy.search(search_param, self.offset, self.limit, self.sort_key + ' ' +self.sort_order, context)
-                else:
-                    if search_text:
-                        if self.source == '_terp_list':
-                            ids = proxy.search(search_param, self.offset, self.limit, False, context)
-                    else:
-                        ids = proxy.search(search_param, self.offset, self.limit, False, context)
-            else:
-                ids = proxy.search(search_param, 0, 0, 0, context)
+            limit = 0
+            sort_info = False
+            if self.limit >= 0:
+                limit = self.limit
+            if self.sort_key:
+                sort_info = self.sort_key + ' ' +self.sort_order
+                
+            ids = proxy.search(search_param, self.offset, limit, sort_info, context)
+            
             if len(ids) < self.limit:
                 if self.offset > 0:
                     self.count = len(ids) + self.offset