Ticket #8159: 8159.diff

django/contrib/admin/templates/admin/auth/user/delete_confirmation.html

@@ +1 @@
+{% extends "admin/delete_confirmation.html" %}
+{% load i18n %}
+
+{% block content %}
+{% ifequal user object %}
+<ul class="errorlist">
+        <li>{% trans "You are attempting to delete yourself" %}</li>
+</ul>
+{% endifequal %}
+{{block.super}}
+{% endblock %}

django/contrib/auth/admin.py

@@ -108 +108 @@
             'root_path': self.admin_site.root_path,
         }, context_instance=RequestContext(request))
 
+    def log_deletion(self, request, object, object_repr):
+        'Do not record if the current user id is None, i.e. it has been deleted - ticket #8159'
+        
+        if request.user.id:
+            super(UserAdmin, self).log_deletion(request, object, object_repr)
+    
+    def message_user(self, request, message):
+        'Do not message if the current user id is None, i.e. it has been deleted - ticket #8159'
+        
+        if request.user.id:
+            super(UserAdmin, self).message_user(request, message)
 
+
 admin.site.register(Group, GroupAdmin)
 admin.site.register(User, UserAdmin)
 

django/contrib/auth/__init__.py

@@ -1 +1 @@
 import datetime
 from django.core.exceptions import ImproperlyConfigured
+from django.db.models.signals import post_delete
 
 SESSION_KEY = '_auth_user_id'
 BACKEND_SESSION_KEY = '_auth_user_backend'
@@ -78 +79 @@
         request.user = AnonymousUser()
 
 def get_user(request):
-    from django.contrib.auth.models import AnonymousUser
+    from django.contrib.auth.models import User, AnonymousUser
     try:
         user_id = request.session[SESSION_KEY]
         backend_path = request.session[BACKEND_SESSION_KEY]
@@ -86 +87 @@
         user = backend.get_user(user_id) or AnonymousUser()
     except KeyError:
         user = AnonymousUser()
+        
+    if not user.is_anonymous():
+        post_delete.connect(user.check_if_deleted, sender=User)
+
     return user

django/contrib/auth/models.py

@@ -287 +287 @@
                 raise SiteProfileNotAvailable
         return self._profile_cache
 
+    def check_if_deleted(self, sender, **kwargs):
+        'Check if this User has just been deleted, and set our id to None if so'
+        instance = kwargs['instance']
+        id_name = User._meta.pk.attname
+        if getattr(self, id_name) == getattr(instance, id_name):
+            setattr(self, id_name, None)
+
+
 class Message(models.Model):
     """
     The message system is a lightweight way to queue messages for given