[gnue] r9131 - trunk/gnue-forms/src/input/displayHandlers

[reinhard]

Author: reinhard
Date: 2006-12-12 07:05:18 -0600 (Tue, 12 Dec 2006)
New Revision: 9131

Modified:
   trunk/gnue-forms/src/input/displayHandlers/Checkbox.py
   trunk/gnue-forms/src/input/displayHandlers/Cursor.py
   trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
   trunk/gnue-forms/src/input/displayHandlers/Listbox.py
   trunk/gnue-forms/src/input/displayHandlers/Password.py
Log:
Use field.get_value() which returns the foreign key lookup directly.


Modified: trunk/gnue-forms/src/input/displayHandlers/Checkbox.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Checkbox.py      2006-12-12 
12:58:46 UTC (rev 9130)
+++ trunk/gnue-forms/src/input/displayHandlers/Checkbox.py      2006-12-12 
13:05:18 UTC (rev 9131)
@@ -120,7 +120,7 @@
 
     self.editing = self.field.isEditable()
 
-    self.work = self.__sanitize_value(self.field.getValue())
+    self.work = self.__sanitize_value(self.field.get_value())
     self.display = self.work
     self.modified = False
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-12 
12:58:46 UTC (rev 9130)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-12 
13:05:18 UTC (rev 9131)
@@ -173,13 +173,9 @@
     """
     self.editing = self.field.isEditable()
     self.modified = False
-
-    # TODO: Replace with formatter
     self.work = self.field.get_value() or u""
     self.display = self.build_display(self.work, True)
-
     self._cursor = len(self.display)
-    # Ensure cursor is properly placed.
     self.setSelectionArea(0, self._cursor)
     self.generateRefreshEvent()
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-12-12 
12:58:46 UTC (rev 9130)
+++ trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-12-12 
13:05:18 UTC (rev 9131)
@@ -61,17 +61,7 @@
     self.modified = False
 
     # TODO: Replace with formatter
-    value = self.field.getValue()
-
-    if value is None:
-      self.work = ""
-    else:
-        if self.field._allowedValues \
-                and "%s" % value in self.field._allowedValues:
-            self.work = self.field._allowedValues ["%s" % value]
-        else:
-            self.work = ""
-
+    self.work = self.field.get_value() or u""
     self.display = self.build_display(self.work, True)
 
     self._cursor = len(self.display)

Modified: trunk/gnue-forms/src/input/displayHandlers/Listbox.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Listbox.py       2006-12-12 
12:58:46 UTC (rev 9130)
+++ trunk/gnue-forms/src/input/displayHandlers/Listbox.py       2006-12-12 
13:05:18 UTC (rev 9131)
@@ -56,19 +56,7 @@
     self.modified = False
 
     # TODO: Replace with formatter
-    value = self.field.getValue()
-
-    if value == None:
-      self.work = ""
-    else:
-      try:
-        self.work = self.field._allowedValues ["%s" % value]
-      except KeyError:
-        self.work = ""
-        event.__error__ = True
-        event.__errortext__ = u_("Invalid value '%s' for keyed pull-down "
-                                 "field") % value
-
+    self.work = self.field.get_value()
     display = self.build_display(self.work, True)
 
     self._cursor = len(self.display)

Modified: trunk/gnue-forms/src/input/displayHandlers/Password.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Password.py      2006-12-12 
12:58:46 UTC (rev 9130)
+++ trunk/gnue-forms/src/input/displayHandlers/Password.py      2006-12-12 
13:05:18 UTC (rev 9131)
@@ -53,14 +53,9 @@
     """
     self.editing = self.field.isEditable()
     self.modified = False
-
-    # TODO: Replace with formatter
-    value = self.field.getValue()
-    self.work = value or ""
+    self.work = self.field.get_value() or u""
     self.display = self.build_display(self.work, True)
-
     self.cursor = len(self.display)
-    # Ensure cursor is properly placed.
     self.setSelectionArea(0, self.cursor)
     self.generateRefreshEvent()