[gnue] r9107 - in trunk/gnue-forms/src: GFObjects input/displayHandlers

[reinhard]

Author: reinhard
Date: 2006-12-04 10:56:11 -0600 (Mon, 04 Dec 2006)
New Revision: 9107

Modified:
   trunk/gnue-forms/src/GFObjects/GFField.py
   trunk/gnue-forms/src/GFObjects/GFTabStop.py
   trunk/gnue-forms/src/input/displayHandlers/Cursor.py
Log:
Make use of the new get_value function that already returns the FK lookup for
lookup fields.


Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2006-12-04 16:29:58 UTC (rev 
9106)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2006-12-04 16:56:11 UTC (rev 
9107)
@@ -240,18 +240,20 @@
     # Reading and writing the user value of the field
     # -------------------------------------------------------------------------
 
-    def get_value(self):
+    def get_value(self, offset=0):
         """
         Return the current user value of the field. For lookup fields, this is
         the foreign key description.
         """
 
         if not self.__is_lookup:
-            return self.__get_value()
+            return self.__get_value(offset)
 
-        db_value = '%s' % self.__get_value()    # convert to string or unicode
+        db_value = self.__get_value(offset)
 
-        if db_value in self._allowedValues:
+        if self._allowedValues is None or db_value is None:
+            return u""
+        elif db_value in self._allowedValues:
             return self._allowedValues[db_value]
         else:
             # db returned value that is actually not allowed
@@ -274,6 +276,7 @@
         else:
             raise InvalidFieldValueError(self.name, value)
 
+
     # -------------------------------------------------------------------------
     # Reading and writing the DB value of a field
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFObjects/GFTabStop.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFTabStop.py 2006-12-04 16:29:58 UTC (rev 
9106)
+++ trunk/gnue-forms/src/GFObjects/GFTabStop.py 2006-12-04 16:56:11 UTC (rev 
9107)
@@ -501,8 +501,8 @@
             # Do not execute if we were editing - would overwrite unsaved 
change
             if not (index == self._visibleIndex \
                     and self._displayHandler.editing):
-                value = self._field.getValue(index - self._visibleIndex)
-                display = self._displayHandler.getDisplayFiller(value)
+                value = self._field.get_value(index - self._visibleIndex)
+                display = self._displayHandler.build_display(value)
                 self.uiWidget._ui_set_value_(index, display)
 
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-04 
16:29:58 UTC (rev 9106)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-04 
16:56:11 UTC (rev 9107)
@@ -687,6 +687,7 @@
       else:
         return "%s" % value
 
+
   def _buildDisplay(self):
     """
     Private function that rebuilds the display string.
@@ -701,6 +702,21 @@
       self.display = self._buildDisplayHelper(self.value, False)
 
 
+    # -------------------------------------------------------------------------
+    # Build the display string
+    # -------------------------------------------------------------------------
+
+  def build_display(self, value):
+        """
+        Build the display string from the user value.
+        """
+        
+        if value is None:
+            return ""
+        else:
+            return unicode(value)
+
+
   def updateFieldValue (self):
     """
     Update the associated field with the current value of the display handler