Ticket #14355: patch.5.with_test.diff

django/contrib/admin/helpers.py

@@ -1 +1 @@
 from django import forms
 from django.conf import settings
 from django.contrib.admin.util import flatten_fieldsets, lookup_field
-from django.contrib.admin.util import display_for_field, label_for_field
+from django.contrib.admin.util import display_for_field, label_for_field, help_text_for_field
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models.fields.related import ManyToManyRel
@@ -140 +140 @@
             class_name = field.__name__ != '<lambda>' and field.__name__ or ''
         else:
             class_name = field
+
         self.field = {
             'name': class_name,
             'label': label,
             'field': field,
+                        'help_text': help_text_for_field(class_name, form._meta.model)
         }
+
         self.form = form
         self.model_admin = model_admin
         self.is_first = is_first
         self.is_checkbox = False
         self.is_readonly = True
+        self.help_text = help_text_for_field(class_name, form._meta.model)
 
     def label_tag(self):
         attrs = {}

django/contrib/admin/templates/admin/includes/fieldset.html

@@ -19 +19 @@
                             {{ field.field }}
                         {% endif %}
                     {% endif %}
-                    {% if field.field.field.help_text %}
-                        <p class="help">{{ field.field.field.help_text|safe }}</p>
+                    {% if field.field.help_text %}
+                        <p class="help">{{ field.field.help_text|safe }}</p>
                     {% endif %}
                 </div>
             {% endfor %}

django/contrib/admin/util.py

@@ -266 +266 @@
     else:
         return label
 
+def help_text_for_field(name, model):
+    try:
+        help_text = model._meta.get_field_by_name(name)[0].help_text
+    except models.FieldDoesNotExist:
+        help_text = ""
+    return smart_unicode(help_text)
+
 
 def display_for_field(value, field):
     from django.contrib.admin.templatetags.admin_list import _boolean_icon

tests/regressiontests/admin_views/models.py

@@ -495 +495 @@
 class Post(models.Model):
     title = models.CharField(max_length=100)
     content = models.TextField()
-    posted = models.DateField(default=datetime.date.today)
+    posted = models.DateField(
+            default=datetime.date.today,
+            help_text="Date post was posted and some unicode: ŠĐĆŽćžšđ"
+    )
     public = models.NullBooleanField()
 
     def awesomeness_level(self):

tests/regressiontests/admin_views/tests.py

@@ -2308 +2308 @@
         self.assertContains(response, '<div class="form-row posted">')
         self.assertContains(response, '<div class="form-row value">')
         self.assertContains(response, '<div class="form-row ">')
+        self.assertContains(response, 'Date post was posted and some unicode: ŠĐĆŽćžšđ')
 
         p = Post.objects.create(title="I worked on readonly_fields", content="Its good stuff")
         response = self.client.get('/test_admin/admin/admin_views/post/%d/' % p.pk)