[gnue] r8551 - trunk/gnue-forms/src

[reinhard]

Author: reinhard
Date: 2006-08-08 13:59:06 -0500 (Tue, 08 Aug 2006)
New Revision: 8551

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
Log:
Moved code to close form to GFForm.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-08-08 16:59:12 UTC (rev 8550)
+++ trunk/gnue-forms/src/GFForm.py      2006-08-08 18:59:06 UTC (rev 8551)
@@ -1698,6 +1698,26 @@
 
 
     # -------------------------------------------------------------------------
+    # Close this window
+    # -------------------------------------------------------------------------
+
+    def execute_close(self):
+
+        self.processTrigger('Pre-Exit', ignoreAbort = False)
+
+        if self._currentBlock.autoCommit and not self.isSaved():
+            self.commit()
+
+        if not self.__must_save():
+            return
+
+        self.processTrigger('On-Exit')
+
+        self._exiting = True
+        self.dispatchEvent('exitApplication', _formName=self.name, _form=self)
+
+
+    # -------------------------------------------------------------------------
     # Ask the user whether to save or to discard changes if there are any
     # -------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-08-08 16:59:12 UTC (rev 8550)
+++ trunk/gnue-forms/src/GFInstance.py  2006-08-08 18:59:06 UTC (rev 8551)
@@ -816,29 +816,9 @@
     """
     When exit is requested verify that the data has been saved
     """
+    event._form.execute_close()
 
-    try:
-      event._form.processTrigger ('Pre-Exit', ignoreAbort = False)
 
-      # TODO: WTF? This isn't saving a currently edited field
-      if event._form._currentBlock.autoCommit and not event._form.isSaved ():
-        event._form.commit ()
-
-      if not event._form.isSaved ():
-        self.displayMessageBox (_("Data not saved. Save changes or clear "
-               "the form to proceed."), 'Error')
-        event._form.refreshUIEvents ()
-      else:
-        event._form.processTrigger ('On-Exit')
-        event._form._exiting = True
-        self.dispatchEvent ('exitApplication', _('Current data is saved'),
-                           _formName = event._form.name, _form = event._form)
-
-    except AbortRequest, t:
-      self.displayMessageBox (t, 'Warning')
-      event._form.refreshUIEvents ()
-
-
   # ---------------------------------------------------------------------------
   # Mark a record for deletion
   # ---------------------------------------------------------------------------