Ticket #15661: 15661_logentry_unicode.diff

django/contrib/admin/models.py

@@ -33 +33 @@
     def __repr__(self):
         return smart_unicode(self.action_time)
 
+    def __unicode__(self):
+
+        return_value = _('LogEntry Object')        
+
+        if self.action_flag == ADDITION:
+            return_value = _('Added "%(object)s".') % {'object': self.object_repr}
+        elif self.action_flag == CHANGE:
+            return_value = _('Changed "%(object)s" - %(changes)s') % {'object': self.object_repr, 'changes': self.change_message}
+        elif self.action_flag == DELETION:
+            return_value = _('Deleted "%(object)s."') % {'object': self.object_repr}
+
+        return return_value
+
     def is_addition(self):
         return self.action_flag == ADDITION
 
@@ -53 +66 @@
         """
         if self.content_type and self.object_id:
             return mark_safe(u"%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, quote(self.object_id)))
-        return None
- No newline at end of file
+        return None

tests/regressiontests/admin_util/tests.py

@@ -235 +235 @@
             label_for_field('guest', Event, return_attr=True),
             ('awesome guest', None),
         )
+
+    def test_logentry_unicode(self):
+        """
+        Regression test for #15661
+        """
+        log_entry = admin.models.LogEntry()
+
+        log_entry.action_flag = admin.models.ADDITION
+        self.assertTrue(
+            log_entry.__unicode__().startswith('Added ')
+        )
+
+        log_entry.action_flag = admin.models.CHANGE
+        self.assertTrue(
+            log_entry.__unicode__().startswith('Changed ')
+        )
+
+        log_entry.action_flag = admin.models.DELETION
+        self.assertTrue(
+            log_entry.__unicode__().startswith('Deleted ')
+        )
+
+        
+
+
+
+