r5914 - trunk/gnue-forms/src/GFObjects

[dneighbo]

Author: dneighbo
Date: 2004-06-15 13:45:00 -0500 (Tue, 15 Jun 2004)
New Revision: 5914

Modified:
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Honor prequery="N" or no prequery= statement for FK datasources.
This WILL break backwards compability for anyone relying on AUTO
query of foreignkey datasources.  You will need to add 
prequery="Y" to your datasource to make it load on startup.


Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-15 16:54:51 UTC (rev 
5913)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-15 18:45:00 UTC (rev 
5914)
@@ -215,9 +215,14 @@
       if hasattr (self._fk_datasource, 'master') and 
self._fk_datasource.master:
         self._fk_datasource.registerResultSetListener 
(self.__loadAllowedValues)
       else:
-#        if (self._fk_datasource.prequery == True):
-        self.__loadAllowedValues (self._fk_datasource.createResultSet ())
+        if (self._fk_datasource.prequery == True):
+          self.__loadAllowedValues (self._fk_datasource.createResultSet ())
+        else:
+          self._allowedValues = {"":""}
+          self._allowedValuesDescr = [""]
+          self._allowedValuesReverse = {"":""}
 
+
     if hasattr(self, 'queryDefault') and \
          self.queryDefault != None and \
          self._bound and \