Django

Code

Changeset 4444

Show
Ignore:
Timestamp:
01/28/07 16:42:23 (2 years ago)
Author:
adrian
Message:

newforms-admin: Got help text displaying in admin pages

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin/django/contrib/admin/options.py

    r4430 r4444  
    213213        if isinstance(db_field, models.DateTimeField): 
    214214            return forms.SplitDateTimeField(required=not db_field.blank, 
    215                 widget=widgets.AdminSplitDateTime(), label=capfirst(db_field.verbose_name), **kwargs) 
     215                widget=widgets.AdminSplitDateTime(), label=capfirst(db_field.verbose_name), 
     216                help_text=db_field.help_text, **kwargs) 
    216217 
    217218        # For DateFields, add a custom CSS class. 
  • django/branches/newforms-admin/django/contrib/admin/templates/admin/change_form.html

    r4382 r4444  
    5555                {{ field.label_tag }}{{ field.field }} 
    5656            {% endif %} 
    57             {% if field.help_text %}<p class="help">{{ field.help_text }}</p>{% endif %} 
     57            {% if field.field.field.help_text %}<p class="help">{{ field.field.field.help_text }}</p>{% endif %} 
    5858        {% endfor %} 
    5959        </div> 
  • django/branches/newforms-admin/django/db/models/fields/__init__.py

    r4443 r4444  
    737737 
    738738    def formfield(self, **kwargs): 
    739         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)
     739        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text
    740740        defaults.update(kwargs) 
    741741        return forms.NullBooleanField(**defaults)