Django

Code

Changeset 4443

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

newforms-admin: Merged to [4442]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/db/models/fields/__init__.py

    r4414 r4443  
    337337    def formfield(self, **kwargs): 
    338338        "Returns a django.newforms.Field instance for this database Field." 
    339         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     339        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    340340        defaults.update(kwargs) 
    341341        return forms.CharField(**defaults) 
    …… 
    399399 
    400400    def formfield(self, **kwargs): 
    401         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     401        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    402402        defaults.update(kwargs) 
    403403        return forms.BooleanField(**defaults) 
    …… 
    418418 
    419419    def formfield(self, **kwargs): 
    420         defaults = {'max_length': self.maxlength, 'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     420        defaults = {'max_length': self.maxlength, 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    421421        defaults.update(kwargs) 
    422422        return forms.CharField(**defaults) 
    …… 
    494494 
    495495    def formfield(self, **kwargs): 
    496         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     496        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    497497        defaults.update(kwargs) 
    498498        return forms.DateField(**defaults) 
    …… 
    557557 
    558558    def formfield(self, **kwargs): 
    559         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     559        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    560560        defaults.update(kwargs) 
    561561        return forms.DateTimeField(**defaults) 
    …… 
    576576 
    577577    def formfield(self, **kwargs): 
    578         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     578        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    579579        defaults.update(kwargs) 
    580580        return forms.EmailField(**defaults) 
    …… 
    713713 
    714714    def formfield(self, **kwargs): 
    715         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     715        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    716716        defaults.update(kwargs) 
    717717        return forms.IntegerField(**defaults) 
    …… 
    777777 
    778778    def formfield(self, **kwargs): 
    779         defaults = {'required': not self.blank, 'widget': forms.Textarea, 'label': capfirst(self.verbose_name)} 
     779        defaults = {'required': not self.blank, 'widget': forms.Textarea, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    780780        defaults.update(kwargs) 
    781781        return forms.CharField(**defaults) 
    …… 
    822822 
    823823    def formfield(self, **kwargs): 
    824         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     824        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    825825        defaults.update(kwargs) 
    826826        return forms.TimeField(**defaults) 
    …… 
    841841 
    842842    def formfield(self, **kwargs): 
    843         defaults = {'required': not self.blank, 'verify_exists': self.verify_exists, 'label': capfirst(self.verbose_name)} 
     843        defaults = {'required': not self.blank, 'verify_exists': self.verify_exists, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    844844        defaults.update(kwargs) 
    845845        return forms.URLField(**defaults) 

  • django/branches/newforms-admin/django/db/models/fields/related.py

    r4432 r4443  
    542542 
    543543    def formfield(self, **kwargs): 
    544         defaults = {'choices': self.get_choices_default(), 'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     544        defaults = {'choices': self.get_choices_default(), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    545545        defaults.update(kwargs) 
    546546        return forms.ChoiceField(**defaults) 
    …… 
    603603 
    604604    def formfield(self, **kwargs): 
    605         defaults = {'choices': self.get_choices_default(), 'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     605        defaults = {'choices': self.get_choices_default(), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    606606        defaults.update(kwargs) 
    607607        return forms.ChoiceField(**kwargs) 
    …… 
    714714        if kwargs.get('initial') is not None: 
    715715            kwargs['initial'] = [i._get_pk_val() for i in kwargs['initial']] 
    716         defaults = {'choices': self.get_choices_default(), 'required': not self.blank, 'label': capfirst(self.verbose_name)} 
     716        defaults = {'choices': self.get_choices_default(), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 
    717717        defaults.update(kwargs) 
    718718        return forms.MultipleChoiceField(**defaults) 

  • django/branches/newforms-admin/tests/modeltests/model_forms/models.py

    r4441 r4443  
    3333 
    3434class Writer(models.Model): 
    35     name = models.CharField(maxlength=50) 
     35    name = models.CharField(maxlength=50, help_text='Use both first and last names.') 
    3636 
    3737    def __str__(self): 
    …… 
    151151<option value="2">It&#39;s a test</option> 
    152152<option value="3">Third test</option> 
    153 </select></td></tr> 
     153</select><br /> Hold down "Control", or "Command" on a Mac, to select more than one.</td></tr> 
    154154 
    155155You can pass a custom Form class to form_for_model. Make sure it's a 
    …… 
    170170>>> f = RoykoForm(auto_id=False) 
    171171>>> print f 
    172 <tr><th>Name:</th><td><input type="text" name="name" value="Mike Royko" maxlength="50" /></td></tr> 
     172<tr><th>Name:</th><td><input type="text" name="name" value="Mike Royko" maxlength="50" /><br />Use both first and last names.</td></tr> 
    173173 
    174174>>> art = Article(headline='Test article', pub_date=datetime.date(1988, 1, 4), writer=w, article='Hello.') 
    …… 
    191191<option value="2">It&#39;s a test</option> 
    192192<option value="3">Third test</option> 
    193 </select></li> 
     193</select>  Hold down "Control", or "Command" on a Mac, to select more than one.</li> 
    194194>>> f = TestArticleForm({'headline': u'New headline', 'pub_date': u'1988-01-04', 'writer': u'1', 'article': 'Hello.'}) 
    195195>>> f.is_valid() 
    …… 
    223223<option value="2">It&#39;s a test</option> 
    224224<option value="3">Third test</option> 
    225 </select></li> 
     225</select>  Hold down "Control", or "Command" on a Mac, to select more than one.</li> 
    226226 
    227227>>> f = TestArticleForm({'headline': u'New headline', 'pub_date': u'1988-01-04',