# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1277128693 -7200
# Node ID 5d72fbba92e9d061a05997f93f4dadc5573c8088
# Parent  282194aa43f31277cc45db4b577a2166c30388eb
[form] apply patch #933771: format_single_value / vocabulary methods should *always* return actual value as an unicode string

diff -r 282194aa43f3 -r 5d72fbba92e9 web/formfields.py
--- a/web/formfields.py	Mon Jun 21 15:34:46 2010 +0200
+++ b/web/formfields.py	Mon Jun 21 15:58:13 2010 +0200
@@ -949,7 +949,7 @@
     linkedto = entity.linked_to(rtype, role)
     if linkedto:
         buildent = entity._cw.entity_from_eid
-        return [(buildent(eid).view('combobox'), eid) for eid in linkedto]
+        return [(buildent(eid).view('combobox'), unicode(eid)) for eid in linkedto]
     return []
 
 def relvoc_init(entity, rtype, role, required=False):
@@ -960,7 +960,7 @@
     # vocabulary doesn't include current values, add them
     if entity.has_eid():
         rset = entity.related(rtype, role)
-        vocab += [(e.view('combobox'), e.eid) for e in rset.entities()]
+        vocab += [(e.view('combobox'), unicode(e.eid)) for e in rset.entities()]
     return vocab
 
 def relvoc_unrelated(entity, rtype, role, limit=None):
@@ -1050,7 +1050,7 @@
             form.formvalues[(self, form)] = value
 
     def format_single_value(self, req, value):
-        return value
+        return unicode(value)
 
     def process_form_value(self, form):
         """process posted form and return correctly typed value"""