openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-781247-ysa into lp:openobject-server.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-781247-ysa/+merge/61933

[FIX] fields.function work in multi mode for binary type. return field name with size on multi mode in get_nice_size method.
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-781247-ysa/+merge/61933
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-bug-781247-ysa.

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2011-03-15 13:26:28 +0000
+++ openerp/osv/fields.py	2011-05-23 09:03:29 +0000
@@ -687,12 +687,19 @@
 
 def get_nice_size(a):
     (x,y) = a
+    size = 0
+    if y and isinstance(y, dict):
+        if y.keys() and isinstance(y.get(y.keys()[0]), (int,long)):
+            size = y.get(y.keys()[0],0)
+        elif y.keys() and y.get(y.keys()[0]):
+            size = len(y.get(y.keys()[0]))
+        y.update({y.keys()[0]: tools.human_size(size)})
+        return (x, y)
+
     if isinstance(y, (int,long)):
         size = y
     elif y:
         size = len(y)
-    else:
-        size = 0
     return (x, tools.human_size(size))
 
 def sanitize_binary_value(dict_item):
@@ -833,9 +840,9 @@
                 # Converting value into string so that it does not affect XML-RPC Limits
                 if isinstance(res[r],dict): # To treat integer values with _multi attribute
                     for record in res[r].keys():
-                        res[r][record] = str(res[r][record])
+                        res[r][record] = tools.ustr(res[r][record])
                 else:
-                    res[r] = str(res[r])
+                    res[r] = tools.ustr(res[r])
         return res
     get_memory = get