Ticket #21734: django-admin-protectederror.patch

django/contrib/admin/actions.py

@@ -10 +10 @@
 from django.template.response import TemplateResponse
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy, ugettext as _
+from django.db.models.deletion import ProtectedError
 
 
 def delete_selected(modeladmin, request, queryset):
@@ -46 +47 @@
             for obj in queryset:
                 obj_display = force_text(obj)
                 modeladmin.log_deletion(request, obj, obj_display)
-            queryset.delete()
-            modeladmin.message_user(request, _("Successfully deleted %(count)d %(items)s.") % {
-                "count": n, "items": model_ngettext(modeladmin.opts, n)
-            }, messages.SUCCESS)
+            try:
+                queryset.delete()
+                modeladmin.message_user(request, _("Successfully deleted %(count)d %(items)s.") % {
+                    "count": n, "items": model_ngettext(modeladmin.opts, n)
+                }, messages.SUCCESS)
+            except ProtectedError, e:
+                modeladmin.message_user(request, _("Could not delete %(items)s: %(msg)s.") % {
+                    "items": model_ngettext(modeladmin.opts, n), "msg": e.args[0]
+                }, messages.ERROR)
+
         # Return None to display the change list page again.
         return None