r5897 - trunk/gnue-forms/src/GFObjects

[dneighbo]

Author: dneighbo
Date: 2004-06-14 16:23:40 -0500 (Mon, 14 Jun 2004)
New Revision: 5897

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Added ability to pass result set to resetForeignKey() so that external triggers 
could filter 
down list values via trigger code before resetting.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2004-06-14 06:10:06 UTC (rev 
5896)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2004-06-14 21:23:40 UTC (rev 
5897)
@@ -106,6 +106,8 @@
     self._triggerFunctions={
         'clear':{'function':self.processClear,
                   'description':''},
+        'getResultSet':{'function':self.getResultSet,
+                  'description':''},
         'commit':{'function':self.commit,
                   'description':''},
         'newRecord':{'function':self.newRecord,
@@ -326,8 +328,17 @@
     return self._resultSet.current.isEmpty()
 
   #
+  # getResultSet()
+  # Gets entire result object so can be passed to functions
+  # inside of forms triggers
   #
+  def getResultSet(self):
+    return self._resultSet
+
+
   #
+  #
+  #
   def switchRecord(self, adjustment):
     """
     Moves the proper record into editing position

Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-14 06:10:06 UTC (rev 
5896)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-14 21:23:40 UTC (rev 
5897)
@@ -357,7 +357,7 @@
       dropdownSeparator = dropdownSeparator[1:-1]
 
 
-
+ 
     more = resultSet.firstRecord()
     while more:
       try:
@@ -379,15 +379,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):