Django

Code

Changeset 4305

Show
Ignore:
Timestamp:
01/10/07 17:34:37 (2 years ago)
Author:
adrian
Message:

Fixed #3267 -- newforms: Changed database TextField? to render as Textarea in form_for_model() forms. Thanks for the patch, Philipp Keller

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/models/fields/__init__.py

    r4295 r4305  
    758758        return [oldforms.LargeTextField] 
    759759 
     760    def formfield(self, initial=None): 
     761        return forms.CharField(required=not self.blank, widget=forms.Textarea, label=capfirst(self.verbose_name), initial=initial) 
     762 
    760763class TimeField(Field): 
    761764    empty_strings_allowed = False 
    …… 
    803806class URLField(CharField): 
    804807    def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs): 
    805         kwargs['maxlength'] = kwargs.get('maxlength', 200)  
     808        kwargs['maxlength'] = kwargs.get('maxlength', 200) 
    806809        if verify_exists: 
    807810            kwargs.setdefault('validator_list', []).append(validators.isExistingURL) 
    …… 
    812815        return [oldforms.URLField] 
    813816 
    814     def get_internal_type(self):  
     817    def get_internal_type(self): 
    815818        return "CharField" 
    816819 

  • django/trunk/tests/modeltests/model_forms/models.py

    r4300 r4305  
    4242    pub_date = models.DateField() 
    4343    writer = models.ForeignKey(Writer) 
     44    article = models.TextField() 
    4445    categories = models.ManyToManyField(Category, blank=True) 
    4546 
    …… 
    145146<option value="2">Bob Woodward</option> 
    146147</select></td></tr> 
     148<tr><th>Article:</th><td><textarea name="article"></textarea></td></tr> 
    147149<tr><th>Categories:</th><td><select multiple="multiple" name="categories"> 
    148150<option value="1">Entertainment</option> 
    …… 
    170172<tr><th>Name:</th><td><input type="text" name="name" value="Mike Royko" maxlength="50" /></td></tr> 
    171173 
    172 >>> art = Article(headline='Test article', pub_date=datetime.date(1988, 1, 4), writer=w) 
     174>>> art = Article(headline='Test article', pub_date=datetime.date(1988, 1, 4), writer=w, article='Hello.') 
    173175>>> art.save() 
    174176>>> art.id 
    …… 
    184186<option value="2">Bob Woodward</option> 
    185187</select></li> 
     188<li>Article: <textarea name="article">Hello.</textarea></li> 
    186189<li>Categories: <select multiple="multiple" name="categories"> 
    187190<option value="1">Entertainment</option> 
    …… 
    189192<option value="3">Third test</option> 
    190193</select></li> 
    191 >>> f = TestArticleForm({'headline': u'New headline', 'pub_date': u'1988-01-04', 'writer': u'1'}) 
     194>>> f = TestArticleForm({'headline': u'New headline', 'pub_date': u'1988-01-04', 'writer': u'1', 'article': 'Hello.'}) 
    192195>>> f.is_valid() 
    193196True 
    …… 
    215218<option value="2">Bob Woodward</option> 
    216219</select></li> 
     220<li>Article: <textarea name="article">Hello.</textarea></li> 
    217221<li>Categories: <select multiple="multiple" name="categories"> 
    218222<option value="1" selected="selected">Entertainment</option>