Ticket #11725: django_label_for_none_incl_tests.patch

django/forms/forms.py

@@ -481 +481 @@
         id_ = widget.attrs.get('id') or self.auto_id
         if id_:
             attrs = attrs and flatatt(attrs) or ''
-            contents = u'<label for="%s"%s>%s</label>' % (widget.id_for_label(id_), attrs, unicode(contents))
+            id_for_label = widget.id_for_label(id_)
+            if id_for_label:
+                contents = u'<label for="%s"%s>%s</label>' % (id_for_label, attrs, unicode(contents))
+            else:
+                contents = u'<label%s>%s</label>' % (attrs, unicode(contents))
         return mark_safe(contents)
 
     def css_classes(self, extra_classes=None):

tests/regressiontests/forms/forms.py

@@ -1026 +1026 @@
 <li><label for="id_username">Username:</label> <input id="id_username" type="text" name="username" maxlength="10" /></li>
 <li><label for="id_password">Password:</label> <input type="password" name="password" id="id_password" /></li>
 
+A widget can customize the 'for' value of its label by overriding id_for_label.
+>>> class UserRegistration(Form):
+...    class MyTextInput(TextInput):
+...        def id_for_label(self, id):
+...            return 'my_' + id
+...    username = CharField(max_length=10, widget=MyTextInput)
+...    password = CharField(widget=PasswordInput)
+>>> p = UserRegistration()
+>>> print p.as_ul()
+<li><label for="my_id_username">Username:</label> <input id="id_username" type="text" name="username" maxlength="10" /></li>
+<li><label for="id_password">Password:</label> <input type="password" name="password" id="id_password" /></li>
 
+If id_for_label returns None or is empty, the label won't get a 'for' attribute.
+>>> class UserRegistration(Form):
+...    class MyTextInput(TextInput):
+...        def id_for_label(self, id):
+...            return None
+...    username = CharField(max_length=10, widget=MyTextInput)
+...    password = CharField(widget=PasswordInput)
+>>> p = UserRegistration()
+>>> print p.as_ul()
+<li><label>Username:</label> <input id="id_username" type="text" name="username" maxlength="10" /></li>
+<li><label for="id_password">Password:</label> <input type="password" name="password" id="id_password" /></li>
+
 # Label Suffix ################################################################
 
 You can specify the 'label_suffix' argument to a Form class to modify the