Commit 8bb3763c authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.1.X] Fixed #11632: Fixed the id for hidden initial widget so that it is... 

[1.1.X] Fixed #11632: Fixed the id for hidden initial widget so that it is different from the id for its visible counterpart. Thanks geber@datacollect.com and Mark Lavin. 

r11826 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent c1a8bd67

AUTHORS

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ answer newbie questions, and generally made Django that much better: 
    Alex Gaynor <alex.gaynor@gmail.com>

    Andy Gayton <andy-django@thecablelounge.com>

    Idan Gazit

    geber@datacollect.com

    Baishampayan Ghose

    Dimitris Glezos <dimitris@glezos.com>

    glin@seznam.cz
@@ -265,6 +266,7 @@ answer newbie questions, and generally made Django that much better: 
    Finn Gruwier Larsen <finn@gruwier.dk>

    Lau Bech Lauritzen

    Rune Rønde Laursen <runerl@skjoldhoej.dk>

    Mark Lavin <markdlavin@gmail.com>

    Eugene Lazutkin <http://lazutkin.com/blog/>

    lcordier@point45.com

    Jeong-Min Lee <falsetru@gmail.com>

django/forms/forms.py

+5 −1
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ class BoundField(StrAndUnicode): 
        self.name = name

        self.html_name = form.add_prefix(name)

        self.html_initial_name = form.add_initial_prefix(name)

        self.html_initial_id = form.add_initial_prefix(self.auto_id)

        if self.field.label is None:

            self.label = pretty_name(name)

        else:
@@ -374,7 +375,10 @@ class BoundField(StrAndUnicode): 
        attrs = attrs or {}

        auto_id = self.auto_id

        if auto_id and 'id' not in attrs and 'id' not in widget.attrs:

            if not only_initial:

                attrs['id'] = auto_id

            else:

                attrs['id'] = self.html_initial_id

        if not self.form.is_bound:

            data = self.form.initial.get(self.name, self.field.initial)

            if callable(data):

tests/regressiontests/forms/forms.py

+7 −0
Original line number Diff line number Diff line
@@ -1807,4 +1807,11 @@ True 
>>> [f.name for f in form.visible_fields()]

['artist', 'name']



# Hidden initial input gets its own unique id ################################



>>> class MyForm(Form):

...     field1 = CharField(max_length=50, show_hidden_initial=True)

>>> print MyForm()

<tr><th><label for="id_field1">Field1:</label></th><td><input id="id_field1" type="text" name="field1" maxlength="50" /><input type="hidden" name="initial-field1" id="initial-id_field1" /></td></tr>



"""