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

[reinhard]

Author: reinhard
Date: 2005-04-18 04:20:40 -0500 (Mon, 18 Apr 2005)
New Revision: 7391

Modified:
   trunk/gnue-forms/src/GFObjects/GFDataSource.py
Log:
Check if block is there before calling trigger functions.


Modified: trunk/gnue-forms/src/GFObjects/GFDataSource.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFDataSource.py      2005-04-18 08:37:50 UTC 
(rev 7390)
+++ trunk/gnue-forms/src/GFObjects/GFDataSource.py      2005-04-18 09:20:40 UTC 
(rev 7391)
@@ -58,23 +58,28 @@
   #
 
   def _beforeCommitInsert(self, record):
-    self._form.dispatchEvent('preInsert', record=record, block=self.__block())
-    self._form.dispatchEvent('preCommit', record=record, block=self.__block())
+    if self.__block and self.__block():
+      self._form.dispatchEvent('preInsert', record=record, 
block=self.__block())
+      self._form.dispatchEvent('preCommit', record=record, 
block=self.__block())
 
   def _beforeCommitUpdate(self, record):
-    self._form.dispatchEvent('preUpdate', record=record, block=self.__block())
-    self._form.dispatchEvent('preCommit', record=record, block=self.__block())
+    if self.__block and self.__block():
+      self._form.dispatchEvent('preUpdate', record=record, 
block=self.__block())
+      self._form.dispatchEvent('preCommit', record=record, 
block=self.__block())
 
   def _beforeCommitDelete(self, record):
-    self._form.dispatchEvent('preDelete', record=record, block=self.__block())
-    self._form.dispatchEvent('preCommit', record=record, block=self.__block())
+    if self.__block and self.__block():
+      self._form.dispatchEvent('preDelete', record=record, 
block=self.__block())
+      self._form.dispatchEvent('preCommit', record=record, 
block=self.__block())
 
   def _onModification(self, record):
-    self._form.dispatchEvent('onRecordTouched', record=record,
-        block=self.__block())
+    if self.__block and self.__block():
+      self._form.dispatchEvent('onRecordTouched', record=record,
+          block=self.__block())
     return True
 
   def _onRecordLoaded(self, record):
-    self._form.dispatchEvent('onQueryNewRecord', record=record,
-        block=self.__block())
+    if self.__block and self.__block():
+      self._form.dispatchEvent('onQueryNewRecord', record=record,
+          block=self.__block())
     return True