commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

r5911 - trunk/gnue-forms/src/GFObjects


From: dhill
Subject: r5911 - trunk/gnue-forms/src/GFObjects
Date: Wed, 7 Jul 2004 17:13:52 -0500 (CDT)

Author: dhill
Date: 2004-06-15 11:20:23 -0500 (Tue, 15 Jun 2004)
New Revision: 5911

Modified:
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
SVN sucks!


Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-15 13:42:23 UTC (rev 
5910)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-15 16:20:23 UTC (rev 
5911)
@@ -213,8 +213,10 @@
       # 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:
+#        if (self._fk_datasource.prequery == True):
         self.__loadAllowedValues (self._fk_datasource.createResultSet ())
 
     if hasattr(self, 'queryDefault') and \
@@ -357,7 +359,7 @@
       dropdownSeparator = dropdownSeparator[1:-1]
 
 
-
+ 
     more = resultSet.firstRecord()
     while more:
       try:
@@ -379,15 +381,17 @@
   def allowedValues(self):
     return (self._allowedValues, self._allowedValuesDescr)
 
-  def resetForeignKey(self):
-    # does nothing at all, because it's done automatically now
-    # self._allowedValues = None
-    # self.allowedValues()
+  def resetForeignKey(self, resultSet = None):
+    # Added so forms triggers could set after init/execute queries
+    # which allows filtering of dropdown's in trigger code
+    if resultSet == None:
+      resultSet = self._fk_datasource.createResultSet()
+
     if hasattr (self._fk_datasource, 'master') and self._fk_datasource.master:
       # we should have been notified in this case, did we ?
       pass
     else:
-      self.__loadAllowedValues (self._fk_datasource.createResultSet ())
+      self.__loadAllowedValues(resultSet)
     pass
 
   def isEditable(self, mode):





reply via email to

[Prev in Thread] Current Thread [Next in Thread]