[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7867 - in trunk/gnue-forms/src: . GFObjects
From: |
jamest |
Subject: |
[gnue] r7867 - in trunk/gnue-forms/src: . GFObjects |
Date: |
Wed, 17 Aug 2005 19:33:57 -0500 (CDT) |
Author: jamest
Date: 2005-08-17 19:33:55 -0500 (Wed, 17 Aug 2005)
New Revision: 7867
Modified:
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
delete record now toggles between delete and undelete
Should we change the UI to better reflect this
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2005-08-18 00:32:12 UTC (rev 7866)
+++ trunk/gnue-forms/src/GFForm.py 2005-08-18 00:33:55 UTC (rev 7867)
@@ -476,12 +476,12 @@
#---------------------------------------------------------------------------
# Delete the actual record.
#---------------------------------------------------------------------------
- def deleteRecord(self):
+ def toggleRecordDelete(self):
"""
Deletes the actual record.
"""
if not self.readonly:
- self._currentBlock.deleteRecord()
+ self._currentBlock.toggleDelete()
self.refreshUIEvents()
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2005-08-18 00:32:12 UTC (rev 7866)
+++ trunk/gnue-forms/src/GFInstance.py 2005-08-18 00:33:55 UTC (rev 7867)
@@ -109,7 +109,7 @@
# Data set manipulation
'requestNEWRECORD' : self.newRecord,
- 'requestMARKFORDELETE': self.deleteRecord,
+ 'requestMARKFORDELETE': self.toggleRecordDelete,
'requestCOMMIT' : self.executeCommit,
'requestPRINTOUT' : self.executePrintout,
'requestROLLBACK' : self.executeRollback,
@@ -912,7 +912,7 @@
# Mark a record for deletion
# ---------------------------------------------------------------------------
- def deleteRecord(self, event):
+ def toggleRecordDelete(self, event):
"""
Tells the form to mark a record for delete
"""
@@ -924,7 +924,7 @@
self.dispatchEvent ('formALERT', _('Block does not allow delete'),
_form = event._form)
else:
- event._form.deleteRecord ()
+ event._form.toggleRecordDelete ()
self.updateRecordStatus (event._form)
Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py 2005-08-18 00:32:12 UTC (rev
7866)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py 2005-08-18 00:33:55 UTC (rev
7867)
@@ -363,6 +363,27 @@
self._resultSet.current.delete()
#
+ # undeleteRecord
+ #
+ def undeleteRecord(self):
+ """
+ Removes the delete mark from the record
+ """
+ self._resultSet.current.undelete()
+
+ #
+ # undeleteRecord
+ #
+ def toggleDelete(self):
+ """
+ Toggles the delete mark on a record
+ """
+ if self._resultSet.current.isDeleted():
+ self.undeleteRecord()
+ else:
+ self.deleteRecord()
+
+ #
# isEmpty()
#
def isEmpty(self):
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7867 - in trunk/gnue-forms/src: . GFObjects,
jamest <=