Changeset 7626 for django/branches/newforms-admin/django/contrib/admin/widgets.py

Timestamp:

06/12/08 15:13:27 (5 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #5731 -- Implemented ModelAdmin?.radio_fields to match trunk's radio_admin. Removed legacy code and added tests. Thanks Karen Tracey for the initial work.

Files:

• django/branches/newforms-admin/django/contrib/admin/widgets.py (modified) (2 diffs)

django/branches/newforms-admin/django/contrib/admin/widgets.py

@@ -4 +4 @@
-
-from django import newforms as forms
+from django.newforms.widgets import RadioFieldRenderer
+from django.newforms.util import flatatt
-from django.utils.datastructures import MultiValueDict
-from django.utils.text import capfirst, truncate_words
@@ -62 +64 @@
-        return mark_safe(u'<p class="datetime">%s %s<br />%s %s</p>' % \
-            (_('Date:'), rendered_widgets[0], _('Time:'), rendered_widgets[1]))
+
+class AdminRadioFieldRenderer(RadioFieldRenderer):
+    def render(self):
+        """Outputs a <ul> for this set of radio fields."""
+        return mark_safe(u'<ul%s>\n%s\n</ul>' % (
+            flatatt(self.attrs),
+            u'\n'.join([u'<li>%s</li>' % force_unicode(w) for w in self]))
+        )
+
+class AdminRadioSelect(forms.RadioSelect):
+    renderer = AdminRadioFieldRenderer
-
-class AdminFileWidget(forms.FileInput):