refactor: change method used to assign radiobuttons for boolean

use setdefault('type', 'radiobutton') rather than hardcoding the value
into the underlying self.input (input_html4) call.

Also add test for undefined radiobutton.

Author: rouilj

roundup/cgi/templating.py

@@ -2165,26 +2165,27 @@ def field(self, labelfirst=False, y_label=None, n_label=None,
             n_label += '</label>'
 
         checked = value and "checked" or ""
+        kwargs.setdefault("type", "radio")
         if value:
-            y_rb = self.input(type="radio", name=self._formname, value="yes",
+            y_rb = self.input(name=self._formname, value="yes",
                               checked="checked", id="%s_%s" % (
                                   self._formname, 'yes'), **kwargs)
 
-            n_rb = self.input(type="radio", name=self._formname,  value="no",
+            n_rb = self.input(name=self._formname,  value="no",
                               id="%s_%s" % (
                                   self._formname, 'no'), **kwargs)
         else:
-            y_rb = self.input(type="radio", name=self._formname, value="yes",
+            y_rb = self.input(name=self._formname, value="yes",
                               id="%s_%s" % (self._formname, 'yes'), **kwargs)
 
-            n_rb = self.input(type="radio", name=self._formname,  value="no",
+            n_rb = self.input(name=self._formname,  value="no",
                               checked="checked", id="%s_%s" % (
                                   self._formname, 'no'), **kwargs)
 
         if (u_label):
             if (u_label is True):  # it was set via u_label=True
                 u_label = ''       # make it empty but a string not boolean
-            u_rb = self.input(type="radio", name=self._formname,  value="",
+            u_rb = self.input(name=self._formname,  value="",
                               id="%s_%s" % (self._formname, 'unk'), **kwargs)
         else:
             # don't generate a trivalue radiobutton.

test/test_templating.py

@@ -803,6 +803,8 @@ def test_BoolHTMLRadioButtons(self):
                         'True</label>') % params
             n_label = ('<label class="rblabel" '
                        'for="issue1@%(propname)s_no">False</label>') % params
+            u_label = ('<label class="rblabel" '
+                       'for="issue1@%(propname)s_unk">Ignore</label>') % params
 
             input_expected = (
                 '<input %(check1)sid="issue1@%(propname)s_yes" '
@@ -828,7 +830,23 @@ def test_BoolHTMLRadioButtons(self):
             print(d.field(labelfirst=True))
             self.assertEqual(d.field(labelfirst=True), input_expected)
 
-        # one test on the last d is enough.
+            input_expected = (
+                '<label class="rblabel" for="issue1@%(propname)s_unk">'
+                'Ignore</label>'
+                '<input id="issue1@%(propname)s_unk" '
+                'name="issue1@%(propname)s" type="radio" value="">'
+                '<input %(check1)sid="issue1@%(propname)s_yes" '
+                'name="issue1@%(propname)s" type="radio" value="yes">'
+                '<label class="rblabel" for="issue1@%(propname)s_yes">'
+                'Yes</label>'
+                '<input %(check2)sid="issue1@%(propname)s_no" name="issue1@%(propname)s" '
+                'type="radio" value="no"><label class="rblabel" '
+                'for="issue1@%(propname)s_no">No</label>') % params
+
+            self.assertEqual(d.field(u_label=u_label), input_expected)
+
+
+        # one test with the last d is enough.
         # check permissions return
         is_view_ok_orig = d.is_view_ok
         is_edit_ok_orig = d.is_edit_ok