Merge lp:~openerp-dev/openobject-server/7.0-func-field-postprocess-batch-chs into lp:openobject-server/7.0

[Christophe Simonis (OpenERP)]

[Christophe Simonis (OpenERP) (kangol)]

merged in trunk (no IMP in stable)

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2014-02-13 10:08:36 +0000
+++ openerp/osv/fields.py	2014-02-25 20:39:27 +0000
@@ -1111,42 +1111,69 @@
         return self._fnct_search(obj, cr, uid, obj, name, args, context=context)
 
     def postprocess(self, cr, uid, obj, field, value=None, context=None):
+        return self._postprocess_batch(cr, uid, obj, field, {0: value}, context=context)[0]
+
+    def _postprocess_batch(self, cr, uid, obj, field, values, context=None):
+        if not values:
+            return values
+
         if context is None:
             context = {}
-        result = value
+
         field_type = obj._columns[field]._type
-        if field_type == "many2one":
-            # make the result a tuple if it is not already one
-            if isinstance(value, (int,long)) and hasattr(obj._columns[field], 'relation'):
-                obj_model = obj.pool.get(obj._columns[field].relation)
-                dict_names = dict(obj_model.name_get(cr, SUPERUSER_ID, [value], context))
-                result = (value, dict_names[value])
-
-        if field_type == 'binary':
-            if context.get('bin_size'):
-                # client requests only the size of binary fields
-                result = get_nice_size(value)
-            elif not context.get('bin_raw'):
-                result = sanitize_binary_value(value)
-
-        if field_type == "integer" and value > xmlrpclib.MAXINT:
+        new_values = dict(values)
+
+        if field_type == "integer":
             # integer/long values greater than 2^31-1 are not supported
             # in pure XMLRPC, so we have to pass them as floats :-(
             # This is not needed for stored fields and non-functional integer
             # fields, as their values are constrained by the database backend
             # to the same 32bits signed int limit.
-            result = __builtin__.float(value)
-        return result
+            for rid, value in values.iteritems():
+                if value and value > xmlrpclib.MAXINT:
+                    new_values[rid] = __builtin__.float(value)
+
+        elif field_type == 'binary':
+            if context.get('bin_size'):
+                # client requests only the size of binary fields
+                for rid, value in values.iteritems():
+                    if value:
+                        new_values[rid] = get_nice_size(value)
+            elif not context.get('bin_raw'):
+                for rid, value in values.iteritems():
+                    if value:
+                        new_values[rid] = sanitize_binary_value(value)
+
+        elif field_type == "many2one" and hasattr(obj._columns[field], 'relation'):
+            # make the result a tuple if it is not already one
+            if all(isinstance(value, (int, long)) for value in values.values() if value):
+                obj_model = obj.pool[obj._columns[field].relation]
+                ids = [i for i in values.values() if i]
+                dict_names = dict(obj_model.name_get(cr, SUPERUSER_ID, ids, context))
+                for rid, value in values.iteritems():
+                    if value:
+                        new_values[rid] = (value, dict_names[value])
+
+        return new_values
 
     def get(self, cr, obj, ids, name, uid=False, context=None, values=None):
         result = self._fnct(obj, cr, uid, ids, name, self._arg, context)
-        for id in ids:
-            if self._multi and id in result:
-                for field, value in result[id].iteritems():
-                    if value:
-                        result[id][field] = self.postprocess(cr, uid, obj, field, value, context)
-            elif result.get(id):
-                result[id] = self.postprocess(cr, uid, obj, name, result[id], context)
+        if self._multi:
+            swap = {}
+            for rid, values in result.iteritems():
+                for f, v in values.iteritems():
+                    if f not in name:
+                        continue
+                    swap.setdefault(f, {})[rid] = v
+
+            for field, values in swap.iteritems():
+                new_values = self._postprocess_batch(cr, uid, obj, field, values, context)
+                for rid, value in new_values.iteritems():
+                    result[rid][field] = value
+
+        else:
+            result = self._postprocess_batch(cr, uid, obj, name, result, context)
+
         return result
 
     def set(self, cr, obj, id, name, value, user=None, context=None):