r5562 - trunk/gnue-forms/src

[reinhard]

Author: reinhard
Date: 2004-03-29 05:45:22 -0600 (Mon, 29 Mar 2004)
New Revision: 5562

Modified:
   trunk/gnue-forms/src/GFDisplayHandler.py
Log:
Fixed lookup of allowed values for dropdowns.  We have to use the same type
conversion here than where we generate the dictionary.


Modified: trunk/gnue-forms/src/GFDisplayHandler.py
===================================================================
--- trunk/gnue-forms/src/GFDisplayHandler.py    2004-03-29 10:47:39 UTC (rev 
5561)
+++ trunk/gnue-forms/src/GFDisplayHandler.py    2004-03-29 11:45:22 UTC (rev 
5562)
@@ -163,7 +163,8 @@
 
     if self.modified:
       if self._buildValue():
-        if self.field._allowedValues and not 
self.field._allowedValues.has_key(str(self.value)):
+        if self.field._allowedValues and \
+           not self.field._allowedValues.has_key("%s" % self.value):
           self.work = ""
           event.__error__ = True
           event.__errortext__ = _("Invalid value '%s' for field") % self.value
@@ -751,7 +752,7 @@
       self.work = ""
     else:
       try:
-        self.work = self.field._allowedValues[str(self.value)]
+        self.work = self.field._allowedValues ["%s" % self.value]
       except KeyError:
         self.work = ""
         event.__error__ = True
@@ -775,8 +776,8 @@
           return display
       return value
 
-    if self.field._allowedValues.has_key(value):
-      return self.field._allowedValues[value]
+    if self.field._allowedValues.has_key ("%s" % value):
+      return self.field._allowedValues ["%s" % value]
     else:
       return ""