[gnue] r8719 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2006-10-09 10:30:43 -0500 (Mon, 09 Oct 2006)
New Revision: 8719

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Setting _recordCount in __switch_record seems to be sufficient for all cases.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-09 15:03:53 UTC (rev 
8718)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-09 15:30:43 UTC (rev 
8719)
@@ -265,7 +265,6 @@
   def __dsResultSetActivated (self, event):
 
     self._resultSet = event.resultSet
-    self._recordCount = self._resultSet.getRecordCount ()
 
     # FIXME: during commit, master datasources navigate the current record
     # through the dirty record list and cause the detail blocks to follow
@@ -810,7 +809,6 @@
         self.__focus_out()
 
         self._resultSet.insertRecord(self._lastValues)
-        self._recordCount = self._resultSet.getRecordCount()
 
         self.__focus_in()
 
@@ -839,7 +837,6 @@
         self.__focus_out()
 
         self._resultSet.duplicateRecord(exclude=exclude, include=include)
-        self._recordCount = self._resultSet.getRecordCount()
 
         self.__focus_in()
 
@@ -958,8 +955,6 @@
 
     rootBlock._dataSourceLink.createResultSet (conditions)
 
-    rootBlock._recordCount = rootBlock._resultSet.getRecordCount ()
-
     for block in self._logic._blockList:
       block.processTrigger ('POST-QUERY')
       for field in block._fieldList:
@@ -996,12 +991,11 @@
             self._dataSourceLink.requeryAll(commit)
 
         # Our recordCount might have changed if records were deleted
-        self._recordCount = self._resultSet.getRecordCount()
-
-        # If all records were deleted, create an empty new one.
-        if not self._recordCount:
+        if not self._resultSet.getRecordCount():
             self.new_record()
 
+        self.__switch_record(0)
+
         self.mode = 'normal'
 
   # ---------------------------------------------------------------------------