From 54d2c5442562e30b2d293de6d0fd12f5d75f8b87 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Sun, 28 Jan 2007 22:42:23 +0000
Subject: [PATCH] newforms-admin: Got help text displaying in admin pages

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/admin/options.py                       | 3 ++-
 django/contrib/admin/templates/admin/change_form.html | 2 +-
 django/db/models/fields/__init__.py                   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 946e074624..524ecf4938 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -212,7 +212,8 @@ class ModelAdmin(object):
         # For DateTimeFields, use a special field and widget.
         if isinstance(db_field, models.DateTimeField):
             return forms.SplitDateTimeField(required=not db_field.blank,
-                widget=widgets.AdminSplitDateTime(), label=capfirst(db_field.verbose_name), **kwargs)
+                widget=widgets.AdminSplitDateTime(), label=capfirst(db_field.verbose_name),
+                help_text=db_field.help_text, **kwargs)
 
         # For DateFields, add a custom CSS class.
         if isinstance(db_field, models.DateField):
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html
index 7485f2fbf7..4889557abb 100644
--- a/django/contrib/admin/templates/admin/change_form.html
+++ b/django/contrib/admin/templates/admin/change_form.html
@@ -54,7 +54,7 @@
             {% else %}
                 {{ field.label_tag }}{{ field.field }}
             {% endif %}
-            {% if field.help_text %}<p class="help">{{ field.help_text }}</p>{% endif %}
+            {% if field.field.field.help_text %}<p class="help">{{ field.field.field.help_text }}</p>{% endif %}
         {% endfor %}
         </div>
     {% endfor %}
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 8fe0c20102..157eede01a 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -736,7 +736,7 @@ class NullBooleanField(Field):
         return [oldforms.NullBooleanField]
 
     def formfield(self, **kwargs):
-        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)}
+        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
         defaults.update(kwargs)
         return forms.NullBooleanField(**defaults)