Ticket #11108: delete_model@11970.diff

django/contrib/admin/options.py

@@ -22 +22 @@
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext, ugettext_lazy
 from django.utils.encoding import force_unicode
-try:
-    set
-except NameError:
-    from sets import Set as set     # Python 2.3 fallback
 
 HORIZONTAL, VERTICAL = 1, 2
 # returns the <ul> class for a given radio_admin field
@@ -577 +573 @@
         """
         obj.save()
 
+    def delete_model(self, requet, obj):
+        """
+        Given a model instance delete it from the database.
+        """
+        obj.delete()
+
     def save_formset(self, request, form, formset, change):
         """
         Given an inline formset save it to the database.
@@ -1061 +1063 @@
                 raise PermissionDenied
             obj_display = force_unicode(obj)
             self.log_deletion(request, obj, obj_display)
-            obj.delete()
+            self.delete_model(request, obj)
 
             self.message_user(request, _('The %(name)s "%(obj)s" was deleted successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj_display)})
 

docs/ref/contrib/admin/index.txt

@@ -739 +739 @@
 ``ModelAdmin`` methods
 ----------------------
 
+.. warning::
+
+    ``save_model`` and ``delete_model`` have to save/delete the object, those
+    methods are not for veto purposes, they just allow you to do some extra
+    operations.
+
 .. method:: ModelAdmin.save_model(self, request, obj, form, change)
 
 The ``save_model`` method is given the ``HttpRequest``, a model instance,
@@ -752 +758 @@
             obj.user = request.user
             obj.save()
 
+.. method:: ModelAdmin.delete_model(self, request, obj)
+
+The ``delete_model`` method is given the ``HttpRequest`` and a model instance.
+Use this method to to pre- or post-delete operations.
+
 .. method:: ModelAdmin.save_formset(self, request, form, formset, change)
 
 The ``save_formset`` method is given the ``HttpRequest``, the parent

docs/topics/db/multi-db.txt

@@ -191 +191 @@
 :class:`~django.contrib.admin.ModelAdmin` classes that will direct the
 admin to use a specific database for content.
 
-There are four methods that require customization on a ModelAdmin
+There are five methods that require customization on a ModelAdmin
 object::
 
     class MultiDBModelAdmin(admin.ModelAdmin):
@@ -202 +202 @@
             # Tell Django to save objects to the 'other' database
             obj.save(using=self.using)
 
+        def delete_model(self, requqest, obj):
+            # Tell Django to delete objects from the 'other' database
+            obj.delete(using=self.using)
+
         def queryset(self, request):
             # Tell Django to look for objects on the 'other' database
             return super(MultiDBModelAdmin, self).queryset(request).using(self.using)