mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Got help text displaying in admin pages

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-01-28 22:42:23 +00:00
parent 5d6745301e
commit 54d2c54425
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/admin/options.py
View File

@ -212,7 +212,8 @@ class ModelAdmin(object):
# For DateTimeFields, use a special field and widget. # For DateTimeFields, use a special field and widget.
if isinstance(db_field, models.DateTimeField): if isinstance(db_field, models.DateTimeField):
return forms.SplitDateTimeField(required=not db_field.blank, 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. # For DateFields, add a custom CSS class.
if isinstance(db_field, models.DateField): if isinstance(db_field, models.DateField):

2
django/contrib/admin/templates/admin/change_form.html
View File

@ -54,7 +54,7 @@
{% else %} {% else %}
{{ field.label_tag }}{{ field.field }} {{ field.label_tag }}{{ field.field }}
{% endif %} {% 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 %} {% endfor %}
</div> </div>
{% endfor %} {% endfor %}

2
django/db/models/fields/__init__.py
View File

@ -736,7 +736,7 @@ class NullBooleanField(Field):
return [oldforms.NullBooleanField] return [oldforms.NullBooleanField]
def formfield(self, **kwargs): 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) defaults.update(kwargs)
return forms.NullBooleanField(**defaults) return forms.NullBooleanField(**defaults)