[gnue] r10021 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2009-10-29 05:10:54 -0500 (Thu, 29 Oct 2009)
New Revision: 10021

Modified:
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Fixes for dropdown sources with no current resultset.


Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2009-10-29 09:54:52 UTC (rev 
10020)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2009-10-29 10:10:54 UTC (rev 
10021)
@@ -502,7 +502,8 @@
         # If the field is a foreign key, move the result set to the
         # selected value.
         if hasattr(self, '_GFField__fk_resultSet'):
-            self.__fk_resultSet.findRecord({self.fk_key: new_value})
+            if self.__fk_resultSet is not None:
+                self.__fk_resultSet.findRecord({self.fk_key: new_value})
             # This will cause __refresh_ui_current() to be called via
             # __dsCursorMoved
         else:
@@ -617,7 +618,10 @@
         if dpSep.startswith('"') and dpSep.endswith('"') and len(dpSep) > 2:
             dpSep = dpSep[1:-1]
 
-        array = resultSet.getArray([self.fk_key] + self._fk_descr)
+        if resultSet is not None:
+            array = resultSet.getArray([self.fk_key] + self._fk_descr)
+        else:
+            array = []
         if not array and self.required:
             gDebug(1, "WARNING: empty item added the choices of a required " \
                       "field")
@@ -633,7 +637,8 @@
 
         # And now, position the resultSet to the correct record according to
         # the current field content.
-        resultSet.findRecord({self.fk_key: self.__get_value()})
+        if resultSet is not None:
+            resultSet.findRecord({self.fk_key: self.__get_value()})
 
         # Remember the resultSet for later
         self.__fk_resultSet = resultSet
@@ -656,7 +661,9 @@
         """
 
         if hasattr(self, '_GFField__fk_resultSet'):
-            self.__fk_resultSet.findRecord({self.fk_key: self.__get_value()})
+            if self.__fk_resultSet is not None:
+                self.__fk_resultSet.findRecord({
+                    self.fk_key: self.__get_value()})
 
 
     # -------------------------------------------------------------------------