Ticket #14355: patch.diff

contrib/admin/util.py

@@ -312 +312 @@
     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:
+        message = "Unable to lookup '%s' on %s" % (name, model._meta.object_name)
+        if model_admin:
+            message += " or %s" % (model_admin.__name__,)
+        raise AttributeError(message)
 
+    return help_text
+
 def display_for_field(value, field):
     from django.contrib.admin.templatetags.admin_list import _boolean_icon
     from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE

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 import FieldDoesNotExist
@@ -138 +138 @@
             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 = {}

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

@@ -13 +13 @@
                     {% else %}
                         {{ field.label_tag }}
                         {% if field.is_readonly %}
-                            <p>{{ field.contents }}</p>
+                        <p>{{ field.contents }}</p>
                         {% else %}
                             {{ field.field }}
                         {% endif %}
+                        {% endif %}
+                    {% if field.field.help_text %}
+                        <p class="help">{{ field.field.help_text|safe }}</p>
                     {% endif %}
-                    {% if field.field.field.help_text %}
-                        <p class="help">{{ field.field.field.help_text|safe }}</p>
-                    {% endif %}
                 </div>
             {% endfor %}
         </div>