[gnue] r7383 - in trunk: gnue-common/src/datasources/drivers/Base gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2005-04-15 17:10:21 -0500 (Fri, 15 Apr 2005)
New Revision: 7383

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Fixed maximum recursion depth error.


Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-15 
21:20:59 UTC (rev 7382)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-15 
22:10:21 UTC (rev 7383)
@@ -300,6 +300,11 @@
   # ---------------------------------------------------------------------------
 
   def notifyDetailObjects(self):
+
+    # Do nothing if the resultset is empty.
+    if not self.current:
+      return
+
     gDebug (8,'Master record changed; Notifying Detail Objects')
     for detail in self._dataObject._detailObjects:
       if detail[1]:

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-04-15 21:20:59 UTC (rev 
7382)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-04-15 22:10:21 UTC (rev 
7383)
@@ -502,6 +502,10 @@
   #
   def finalizeCommit (self):
 
+    # Synchronize backend -> resultset -> UI
+    if not self._dataSourceLink.hasMaster ():
+      self._dataSourceLink.requeryAll ()
+
     # Our recordCount might have changed if records were deleted
     self._recordCount = self._resultSet.getRecordCount()
 
@@ -509,10 +513,6 @@
     if not self._recordCount:
       self.newRecord()
 
-    # Synchronize backend -> resultset -> UI
-    if not self._dataSourceLink.hasMaster ():
-      self._dataSourceLink.requeryAll ()
-
     self.mode='normal'
 
 
@@ -529,8 +529,6 @@
       self._dataSourceLink._dataObject._connection.rollback ()
 
     self._dataSourceLink.createEmptyResultSet ()
-    self._currentRecord = 0
-    self._recordCount = 0
 
 
   #
@@ -554,8 +552,6 @@
 
     if not recovering:
       self._dataSourceLink.createEmptyResultSet ()
-      self._currentRecord = 0
-      self._recordCount = 0
 
 
   #