Merge lp:~openerp-dev/openobject-server/7.0-field-size-related-mat into lp:openobject-server/7.0

[Martin Trigaux (OpenERP)]

Bound symbol methods of function field (type char) to the correct methods of the char field

Allows to have automatic truncation of text to the chosen size (avoid needs for manual truncation, eg: bug lp:1208074)

[lp:~openerp-dev/openobject-server/7.0-field-size-related-mat]

5096. By Martin Trigaux (OpenERP) on 2013-10-08

[IMP] move comment to the right line

[Olivier Dony (Odoo) (odo-openerp)]

Looks good to me now, thanks! (just a typo lamda/lambda in the comment - you can probably just drop it)

review: Approve

[lp:~openerp-dev/openobject-server/7.0-field-size-related-mat]

5097. By Martin Trigaux (OpenERP) on 2013-10-08

[IMP] remove useless comment

[Martin Trigaux (OpenERP) (mat-openerp)]

Merged into 7.0

revno: 5094 [merge]
revision-id: <email address hidden>

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2013-06-20 13:10:57 +0000
+++ openerp/osv/fields.py	2013-10-08 11:16:45 +0000
@@ -208,27 +208,29 @@
                 return model.name_get(cr, uid, [int(res_id)], context=context)[0][1]
         return tools.ustr(value)
 
+# takes a string (encoded in utf8) and returns a string (encoded in utf8)
+def _symbol_set_char(self, symb):
+
+    #TODO:
+    # * we need to remove the "symb==False" from the next line BUT
+    #   for now too many things rely on this broken behavior
+    # * the symb==None test should be common to all data types
+    if symb is None or symb == False:
+        return None
+
+    # we need to convert the string to a unicode object to be able
+    # to evaluate its length (and possibly truncate it) reliably
+    u_symb = tools.ustr(symb)
+    return u_symb[:self.size].encode('utf8')
+
 class char(_column):
     _type = 'char'
 
     def __init__(self, string="unknown", size=None, **args):
         _column.__init__(self, string=string, size=size or None, **args)
-        self._symbol_set = (self._symbol_c, self._symbol_set_char)
-
-    # takes a string (encoded in utf8) and returns a string (encoded in utf8)
-    def _symbol_set_char(self, symb):
-        #TODO:
-        # * we need to remove the "symb==False" from the next line BUT
-        #   for now too many things rely on this broken behavior
-        # * the symb==None test should be common to all data types
-        if symb is None or symb == False:
-            return None
-
-        # we need to convert the string to a unicode object to be able
-        # to evaluate its length (and possibly truncate it) reliably
-        u_symb = tools.ustr(symb)
-
-        return u_symb[:self.size].encode('utf8')
+        # self._symbol_set_char defined to keep the backward compatibility
+        self._symbol_f = self._symbol_set_char = lambda x: _symbol_set_char(self, x)
+        self._symbol_set = (self._symbol_c, self._symbol_f)
 
 
 class text(_column):
@@ -1085,6 +1087,11 @@
             self._symbol_f = integer._symbol_f
             self._symbol_set = integer._symbol_set
 
+        if type == 'char':
+            self._symbol_c = char._symbol_c
+            self._symbol_f = lambda x: _symbol_set_char(self, x)
+            self._symbol_set = (self._symbol_c, self._symbol_f)
+
     def digits_change(self, cr):
         if self._type == 'float':
             if self.digits_compute: