Ticket #2723: booleanwidget_radio_with_tests.diff

django/contrib/admin/options.py

@@ -161 +161 @@
-            kwargs['widget'] = widgets.AdminTimeWidget
-            return db_field.formfield(**kwargs)
-
+        # For BooleanFields, use a special widget with a custom css class.
+        if isinstance(db_field, models.BooleanField):
+            kwargs['widget'] = widgets.AdminBooleanSelectWidget
+            return db_field.formfield(**kwargs)
+
-        # For FileFields and ImageFields add a link to the current file.
-        if isinstance(db_field, models.ImageField) or isinstance(db_field, models.FileField):
-            kwargs['widget'] = widgets.AdminFileWidget

django/contrib/admin/widgets.py

@@ -7 +7 @@
-from django.utils.text import capfirst, truncate_words
-from django.utils.translation import ugettext as _
-from django.utils.safestring import mark_safe
+from django.utils.encoding import force_unicode
-from django.conf import settings
-
-class FilteredSelectMultiple(forms.SelectMultiple):
@@ -46 +47 @@
-
-    def __init__(self, attrs={}):
-        super(AdminTimeWidget, self).__init__(attrs={'class': 'vTimeField', 'size': '8'})
+
+class AdminBooleanSelectRenderer(forms.widgets.RadioFieldRenderer):
+    def render(self):
+        """Outputs a <ul> for this set of radio fields."""
+        return mark_safe(u'<ul class="plainlist">\n%s\n</ul>' % u'\n'.join([u'<li>%s</li>'
+                % force_unicode(w) for w in self]))
+
+class AdminBooleanSelectWidget(forms.RadioSelect):
+    renderer = AdminBooleanSelectRenderer
-    
+    def __init__(self, attrs=None):
+        choices = ((u'1', _('Yes')), (u'2', _('No')))
+        super(AdminBooleanSelectWidget, self).__init__(attrs, choices)
+
+    def render(self, name, value, attrs=None, choices=()):
+        try:
+            value = {True: u'1', False: u'2', u'1': u'1', u'2': u'2'}[value]
+        except KeyError:
+            value = u'2'
+        return super(AdminBooleanSelectWidget, self).render(name, value, attrs, choices)
+
+    def value_from_datadict(self, data, files, name):
+        value = data.get(name, None)
+        return {u'1': True, u'2': False, True: True, False: False}.get(value, None)
+    
-class AdminSplitDateTime(forms.SplitDateTimeWidget):
-    """
-    A SplitDateTime Widget that has some admin-specific styling.

tests/regressiontests/admin_widgets/models.py

@@ -28 +28 @@
->>> from django.contrib.admin.widgets import FilteredSelectMultiple, AdminSplitDateTime
->>> from django.contrib.admin.widgets import AdminFileWidget, ForeignKeyRawIdWidget, ManyToManyRawIdWidget
->>> from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
+>>> from django.contrib.admin.widgets import AdminBooleanSelectWidget
-
-Calling conditional_escape on the output of widget.render will simulate what
-happens in the template. This is easier than setting up a template and context
@@ -67 +68 @@
->>> print conditional_escape(w.render('test', [m1.pk, m2.pk], attrs={}))
-<input type="text" name="test" value="1,2" class="vManyToManyRawIdAdminField" /><a href="../../../admin_widgets/member/" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_MEDIA_PREFIX)simg/admin/selector-search.gif" width="16" height="16" alt="Lookup"></a>
-
+The list should have a plainlist class, otherwise both radioselects would be rendered with square bullets in front of them in the Admin.
+
+>>> w = AdminBooleanSelectWidget()
+>>> print conditional_escape(w.render('test', False))
+<ul class="plainlist">
+<li><label><input type="radio" name="test" value="1" /> Yes</label></li>
+<li><label><input checked="checked" type="radio" name="test" value="2" /> No</label></li>
+</ul>
+
+>>> print conditional_escape(w.render('test', True))
+<ul class="plainlist">
+<li><label><input checked="checked" type="radio" name="test" value="1" /> Yes</label></li>
+<li><label><input type="radio" name="test" value="2" /> No</label></li>
+</ul>
-""" % {
-    'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX,
-    'MEDIA_URL': settings.MEDIA_URL,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

AUTHORS

@@ -283 +283 @@
-    Philippe Raoult <philippe.raoult@n2nsoft.com>
-    Massimiliano Ravelli <massimiliano.ravelli@gmail.com>
-    Brian Ray <http://brianray.chipy.org/>
-remco@diji.biz
+Remco Wendt <remco@diji.biz>
-    David Reynolds <david@reynoldsfamily.org.uk>
-    rhettg@gmail.com
-    ricardojbarrios@gmail.com