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

[reinhard]

Author: reinhard
Date: 2005-07-28 01:03:27 -0500 (Thu, 28 Jul 2005)
New Revision: 7756

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Fixes for cases where the master of a datasource is not bound to a 
block.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-07-27 18:54:21 UTC (rev 
7755)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-07-28 06:03:27 UTC (rev 
7756)
@@ -534,7 +534,7 @@
 
     self._resultSet.setRecord(self._precommitRecord)
 
-    if not self._dataSourceLink.hasMaster ():
+    if self._getMasterBlock () is not None:
       self._dataSourceLink.postAll ()
 
   #
@@ -543,7 +543,7 @@
   def finalizeCommit (self):
 
     # Synchronize backend -> resultset -> UI
-    if not self._dataSourceLink.hasMaster ():
+    if not self._getMasterBlock () is not None:
       self._dataSourceLink.requeryAll ()
 
     # Our recordCount might have changed if records were deleted
@@ -562,7 +562,7 @@
   def processClear(self):
 
     # Detail blocks cannot be cleared - they follow their master blindly.
-    if self._dataSourceLink.hasMaster ():
+    if self._getMasterBlock () is not None:
       return
 
     if self._dataSourceLink._connection is not None:
@@ -581,7 +581,7 @@
   def processRollback (self, recovering = False, backendRollback = True):
 
     # Detail blocks cannot be rolled back - they follow their master blindly.
-    if self._dataSourceLink.hasMaster ():
+    if self._getMasterBlock () is not None:
       return
 
     # if called from GFForm the connection's rollback () has been executed
@@ -737,6 +737,9 @@
       for block in self._logic._blockList:
         if block._dataSourceLink == ds:
           return block
+      # return None in case our master is not bound to a block; e.g. if our
+      # master is a dropdown
+      return None
     else:
       return None