Ticket #12952: admin_history.diff

../django/contrib/admin/options.py

@@ -636 +636 @@
         """
         Construct a change message from a changed object.
         """
+
+        def convert_changed_list(obj, changed_data): 
+            cls = type(obj) 
+            verbose_names = [] 
+            for field in changed_data: 
+                try: 
+                    verbose_names.append(cls._meta.get_field_by_name(field)[0].verbose_name) 
+                except FieldDoesNotExist: 
+                    verbose_names.append(field) 
+            return verbose_names
+        
         change_message = []
         if form.changed_data:
-            change_message.append(_('Changed %s.') % get_text_list(form.changed_data, _('and')))
+            change_message.append(_('Changed %s.') % 
+                get_text_list(convert_changed_list(form.instance, form.changed_data), _('and')))
 
         if formsets:
             for formset in formsets:
@@ -648 +660 @@
                                              'object': force_unicode(added_object)})
                 for changed_object, changed_fields in formset.changed_objects:
                     change_message.append(_('Changed %(list)s for %(name)s "%(object)s".')
-                                          % {'list': get_text_list(changed_fields, _('and')),
+                                          % {'list': get_text_list(convert_changed_list(changed_object, changed_fields), 
+                                                _('and')),
                                              'name': force_unicode(changed_object._meta.verbose_name),
                                              'object': force_unicode(changed_object)})
                 for deleted_object in formset.deleted_objects:

../tests/regressiontests/admin_views/tests.py

@@ -1047 +1047 @@
 
         response = self.client.get('/test_admin/admin/secure-view/')
         self.assertContains(response, 'id="login-form"')
+        
+    def testHistoryView(self):
+        change_dict = {'title' : 'Ikke fordømt',
+                       'content': '<p>edited article</p>',
+                       'date_0': '2008-03-18', 'date_1': '10:54:39',
+                       'section': 1}
+        
+        self.client.get('/test_admin/admin/')
+        self.client.post('/test_admin/admin/', self.changeuser_login)
+        post = self.client.post('/test_admin/admin/admin_views/article/1/', change_dict)
+        self.assertEqual(Article.objects.get(pk=1).content, '<p>edited article</p>')
+        response = self.client.get('/test_admin/admin/admin_views/article/1/history/')
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, u'<td>changeuser (Change User)</td>')
+        self.assertContains(response, u'<td>Changed ¿Name?, content and ¿Date published?.</td>')
+        
+        
+        
+        
 
 
 class AdminViewDeletedObjectsTest(TestCase):

../tests/regressiontests/admin_views/models.py

@@ -25 +25 @@
     """
     A simple article to test admin views. Test backwards compatibility.
     """
-    title = models.CharField(max_length=100)
+    title = models.CharField(max_length=100, verbose_name=u'¿Name?')
     content = models.TextField()
-    date = models.DateTimeField()
-    section = models.ForeignKey(Section, null=True, blank=True)
+    date = models.DateTimeField(verbose_name=u'¿Date published?')
+    section = models.ForeignKey(Section, null=True, blank=True, verbose_name=u'¿Section?')
 
     def __unicode__(self):
         return self.title