Changeset 1178

Timestamp:

03/07/10 15:49:29 (5 months ago)

Author:

erikj

Message:

add confirm_delete class attribute to ObjectAdmin?

Location:

trunk/camelot

Files:

• admin/object_admin.py (modified) (3 diffs)
• view/controls/formview.py (modified) (1 diff)
• view/controls/tableview.py (modified) (1 diff)
• view/wizard/importwizard.py (modified) (2 diffs)

trunk/camelot/admin/object_admin.py

@@ -113 +113 @@
     searched.  For use with one2many, many2one or many2many fields, the same
     rules as for the list_filter attribute apply
+    
+    .. attribute:: confirm_delete
+    
+    Indicates if the deletion of an object should be confirmed by the user, defaults
+    to False.  Can be set to either True, False, or the message to display when asking
+    confirmation of the deletion.
 
     .. attribute:: form_size
@@ -172 +178 @@
     list_actions = []
     list_search = []
+    confirm_delete = False
     list_size = (600, 400)
     form_size = (700, 500)
@@ -234 +241 @@
     def get_entity_admin(self, entity):
         return self.app_admin.get_entity_admin(entity)
+    
+    def get_confirm_delete(self):
+        if self.confirm_delete:
+            if self.confirm_delete==True:
+                return _('Are you sure you want to delete this')
+            return self.confirm_delete
+        return False
 
     @model_function

trunk/camelot/view/controls/formview.py

@@ -38 +38 @@
 
 class FormView( AbstractView ):
+
     def __init__( self, title, admin, model, index ):
         AbstractView.__init__( self )

trunk/camelot/view/controls/tableview.py

@@ -372 +372 @@
         """delete the selected rows in this tableview"""
         logger.debug( 'delete selected rows called' )
-        for row in set( map( lambda x: x.row(), self.table.selectedIndexes() ) ):
-            self._table_model.removeRow( row )
+        confirmation_message = self.admin.get_confirm_delete()
+        confirmed = True
+        if confirmation_message:
+            if QtGui.QMessageBox.question(self, 
+                                          _('Please confirm'), 
+                                          unicode(confirmation_message), 
+                                          QtGui.QMessageBox.Yes, 
+                                          QtGui.QMessageBox.No) == QtGui.QMessageBox.No:
+                confirmed = False
+        if confirmed:
+            for row in set( map( lambda x: x.row(), self.table.selectedIndexes() ) ):
+                self._table_model.removeRow( row )
       
     @gui_function

trunk/camelot/view/wizard/importwizard.py

@@ -342 +342 @@
             row_data_admin.get_columns
         )
-
+        self.setWindowTitle(_(self.window_title))
+        self.add_pages(model, row_data_admin)
+        self.setOption(QtGui.QWizard.NoCancelButton)
+
+    def add_pages(self, model, row_data_admin):
+        """
+        Add all pages to the import wizard, reimplement this method to add
+        custom pages to the wizard
+        :param model: the CollectionProxy that will be used to display the to be imported data
+        :param row_dat_admin: the admin interface to be used to display the model, this admin
+        is automatically derived from the admin of the data once it is imported
+        """
         self.addPage(SelectFilePage(parent=self))
         self.addPage(
@@ -351 +362 @@
             )
         )
-        self.addPage(FinalPage(parent=self, model=model))
-        self.setWindowTitle(_(self.window_title))
-
-        self.setOption(QtGui.QWizard.NoCancelButton)
+        self.addPage(FinalPage(parent=self, model=model))