r5898 - trunk/gnue-forms/src/GFObjects

[dneighbo]

Author: dneighbo
Date: 2004-06-14 17:20:21 -0500 (Mon, 14 Jun 2004)
New Revision: 5898

Modified:
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Restored functionality that honors prequery=, even if its on a foreignkey 
datasource.


Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-14 21:23:40 UTC (rev 
5897)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-14 22:20:21 UTC (rev 
5898)
@@ -213,9 +213,11 @@
       # Register as a result set listener
       # if self._fk_datasource.hasMaster (): - not usable before phase 2 init
       if hasattr (self._fk_datasource, 'master') and 
self._fk_datasource.master:
+        print "hi mom wassup"
         self._fk_datasource.registerResultSetListener 
(self.__loadAllowedValues)
       else:
-        self.__loadAllowedValues (self._fk_datasource.createResultSet ())
+        if (self._fk_datasource.prequery == True):
+          self.__loadAllowedValues (self._fk_datasource.createResultSet ())
 
     if hasattr(self, 'queryDefault') and \
          self.queryDefault != None and \