Ticket #8359: 8359choices.diff

django/contrib/admin/models.py

@@ -9 +9 @@
 ADDITION = 1
 CHANGE = 2
 DELETION = 3
+LOG_ACTION_CHOICES = (
+    ( ADDITION, "Added." ),
+    ( CHANGE, "Changed." ),
+    ( DELETION, "Deleted." ),
+)
 
 class LogEntryManager(models.Manager):
     def log_action(self, user_id, content_type_id, object_id, object_repr, action_flag, change_message=''):
@@ -21 +26 @@
     content_type = models.ForeignKey(ContentType, blank=True, null=True)
     object_id = models.TextField(_('object id'), blank=True, null=True)
     object_repr = models.CharField(_('object repr'), max_length=200)
-    action_flag = models.PositiveSmallIntegerField(_('action flag'))
+    action_flag = models.PositiveSmallIntegerField(_('action flag'),choices=LOG_ACTION_CHOICES)
     change_message = models.TextField(_('change message'), blank=True)
     objects = LogEntryManager()
     class Meta:

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

@@ -23 +23 @@
         <tr>
             <th scope="row">{{ action.action_time|date:_("DATE_WITH_TIME_FULL") }}</th>
             <td>{{ action.user.username }}{% if action.user.first_name %} ({{ action.user.first_name }} {{ action.user.last_name }}){% endif %}</td>
-            <td>{{ action.change_message }}</td>
+            <td>{% if action.change_message %}{{ action.change_message }}{% else %}{{ action.get_action_flag_display }}{% endif %}</td>
         </tr>
         {% endfor %}
         </tbody>