Ticket #1611: 0002-Ticket-12232.patch

django/contrib/admin/models.py

@@ -14 +14 @@
     def log_action(self, user_id, content_type_id, object_id, object_repr, action_flag, change_message=''):
         e = self.model(None, None, user_id, content_type_id, smart_unicode(object_id), object_repr[:200], action_flag, change_message)
         e.save()
+        if (action_flag == DELETION):
+            # put all object log entries with the was_deleted flag as True 
+            self.model.objects.filter(content_type=content_type_id,object_id=object_id).update(was_deleted=True)
 
 class LogEntry(models.Model):
     action_time = models.DateTimeField(_('action time'), auto_now=True)
@@ -23 +26 @@
     object_repr = models.CharField(_('object repr'), max_length=200)
     action_flag = models.PositiveSmallIntegerField(_('action flag'))
     change_message = models.TextField(_('change message'), blank=True)
+    was_deleted = models.NullBooleanField(default=False, blank=False, null=True)
 
     objects = LogEntryManager()
 
@@ -54 +58 @@
     def is_deletion(self):
         return self.action_flag == DELETION
 
+    def is_deleted(self):
+        "Returns if the log entry line is referenced to a deleted object or not"
+        return self.was_deleted == True
+
+    def edited_object_still_exists(self):
+        "Check whether the edited object has been removed by a subsequent action" 
+        try:
+            self.get_edited_object()
+            return True
+        except Exception:
+            return False
+
     def get_edited_object(self):
         "Returns the edited object represented by this log entry"
         return self.content_type.get_object_for_this_type(pk=self.object_id)

django/contrib/admin/templates/admin/index.html

@@ -60 +60 @@
             <ul class="actionlist">
             {% for entry in admin_log %}
             <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">
-                {% if entry.is_deletion or not entry.get_admin_url %}
+                {% if entry.is_deleted or not entry.get_admin_url or not entry.edited_object_still_exists %}
                     {{ entry.object_repr }}
                 {% else %}
                     <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>

django/contrib/admin/templates/admin/object_history.html

@@ -28 +28 @@
         </thead>
         <tbody>
         {% for action in action_list %}
-        <tr>
-            <th scope="row">{{ action.action_time|date:"DATETIME_FORMAT" }}</th>
-            <td>{{ action.user.username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}</td>
-            <td>{{ action.change_message }}</td>
-        </tr>
+            {% if not action.is_deleted %}
+            <tr>
+                <th scope="row">{{ action.action_time|date:"DATETIME_FORMAT" }}</th>
+                <td>{{ action.user.username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}</td>
+                <td>{{ action.change_message }}</td>
+            </tr>
+            {% endif %}
         {% endfor %}
         </tbody>
     </table>