r5899 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2004-06-15 03:28:40 -0500 (Tue, 15 Jun 2004)
New Revision: 5899

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Reverted last two commits since they break existing forms.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2004-06-14 22:20:21 UTC (rev 
5898)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2004-06-15 08:28:40 UTC (rev 
5899)
@@ -106,8 +106,6 @@
     self._triggerFunctions={
         'clear':{'function':self.processClear,
                   'description':''},
-        'getResultSet':{'function':self.getResultSet,
-                  'description':''},
         'commit':{'function':self.commit,
                   'description':''},
         'newRecord':{'function':self.newRecord,
@@ -328,17 +326,8 @@
     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 22:20:21 UTC (rev 
5898)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2004-06-15 08:28:40 UTC (rev 
5899)
@@ -213,11 +213,9 @@
       # 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 ())
+        self.__loadAllowedValues (self._fk_datasource.createResultSet ())
 
     if hasattr(self, 'queryDefault') and \
          self.queryDefault != None and \
@@ -359,7 +357,7 @@
       dropdownSeparator = dropdownSeparator[1:-1]
 
 
- 
+
     more = resultSet.firstRecord()
     while more:
       try:
@@ -381,17 +379,15 @@
   def allowedValues(self):
     return (self._allowedValues, self._allowedValuesDescr)
 
-  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()
-
+  def resetForeignKey(self):
+    # does nothing at all, because it's done automatically now
+    # self._allowedValues = None
+    # self.allowedValues()
     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(resultSet)
+      self.__loadAllowedValues (self._fk_datasource.createResultSet ())
     pass
 
   def isEditable(self, mode):