Ticket #5731: 5731-unified.diff

a/django/contrib/admin/__init__.py

@@ -1 @@
-
+, HORIZONTAL, VERTICAL
-from django.contrib.admin.options import StackedInline, TabularInline
-from django.contrib.admin.sites import AdminSite, site

a/django/contrib/admin/options.py

@@ -15 +15 @@
-from django.utils.encoding import force_unicode
-import sets
-
+HORIZONTAL, VERTICAL = 1, 2
+# returns the <ul> class for a given radio_admin value
+get_ul_class = lambda x: 'radiolist%s' % ((x == HORIZONTAL) and ' inline' or '')
+
-class IncorrectLookupParameters(Exception):
-    pass
-
@@ -126 +130 @@
-class BaseModelAdmin(object):
-    """Functionality common to both ModelAdmin and InlineAdmin."""
-    raw_id_fields = ()
+    radio_admin_fields = {}
-    fields = None
-    fieldsets = None
-    filter_vertical = ()
@@ -175 +180 @@
-        if isinstance(db_field, (models.ForeignKey, models.ManyToManyField)):
-            if isinstance(db_field, models.ForeignKey) and db_field.name in self.raw_id_fields:
-                kwargs['widget'] = widgets.ForeignKeyRawIdWidget(db_field.rel)
+            elif isinstance(db_field, models.ForeignKey) and db_field.name in self.radio_admin_fields:
+                kwargs['widget'] = forms.RadioSelect(attrs={'class':get_ul_class(self.radio_admin_fields[db_field.name])})
+                kwargs['empty_label'] = db_field.blank and _('None') or None
-            else:
-                if isinstance(db_field, models.ManyToManyField) and db_field.name in self.raw_id_fields:
-                    kwargs['widget'] = widgets.ManyToManyRawIdWidget(db_field.rel)
@@ -187 +195 @@
-                formfield.widget.render = widgets.RelatedFieldWidgetWrapper(formfield.widget.render, db_field.rel, self.admin_site)
-            return formfield
-
+        if db_field.choices and db_field.name in self.radio_admin_fields:
+            kwargs['widget'] = forms.RadioSelect(choices=db_field.get_choices(include_blank=db_field.blank,
+                                                                              blank_choice=[("", _('None'))]),
+                                                 attrs={'class':get_ul_class(self.radio_admin_fields[db_field.name])})
+            return db_field.formfield(**kwargs)
+
-        # For any other type of field, just call its formfield() method.
-        return db_field.formfield(**kwargs)
-

a/django/contrib/redirects/models.py

@@ -3 +3 @@
-from django.utils.translation import ugettext_lazy as _
-
-class Redirect(models.Model):
-, radio_admin=models.VERTICAL
+
-    old_path = models.CharField(_('redirect from'), max_length=200, db_index=True,
-        help_text=_("This should be an absolute path, excluding the domain name. Example: '/events/search/'."))
-    new_path = models.CharField(_('redirect to'), max_length=200, blank=True,
@@ -28 +28 @@
-class RedirectAdmin(admin.ModelAdmin):
-    list_filter = ('site',)
-    search_fields = ('old_path', 'new_path')
+    radio_admin_fields = { 'site': admin.VERTICAL }
-
-admin.site.register(Redirect, RedirectAdmin)
-

a/django/db/models/fields/__init__.py

@@ -24 +24 @@
-class NOT_PROVIDED:
-    pass
-
-HORIZONTAL, VERTICAL = 1, 2
-
-# The values to use for "blank" in SelectFields. Will be appended to the start of most "choices" lists.
-BLANK_CHOICE_DASH = [("", "---------")]
-BLANK_CHOICE_NONE = [("", "None")]
@@ -33 +31 @@
-# prepares a value for use in a LIKE query
-prep_for_like_query = lambda x: smart_unicode(x).replace("\\", "\\\\").replace("%", "\%").replace("_", "\_")
-
-# returns the <ul> class for a given radio_admin value
-get_ul_class = lambda x: 'radiolist%s' % ((x == HORIZONTAL) and ' inline' or '')
-
-class FieldDoesNotExist(Exception):
-    pass
-
@@ -81 +76 @@
-        max_length=None, unique=False, blank=False, null=False, db_index=False,
-        core=False, rel=None, default=NOT_PROVIDED, editable=True, serialize=True,
-        unique_for_date=None, unique_for_month=None, unique_for_year=None,
-radio_admin=None, 
+
-        db_tablespace=None):
-        self.name = name
-        self.verbose_name = verbose_name
@@ -99 +94 @@
-        self.unique_for_date, self.unique_for_month = unique_for_date, unique_for_month
-        self.unique_for_year = unique_for_year
-        self._choices = choices or []
-        self.radio_admin = radio_admin
-        self.help_text = help_text
-        self.db_column = db_column
-        self.db_tablespace = db_tablespace or settings.DEFAULT_INDEX_TABLESPACE
@@ -255 +249 @@
-            params['max_length'] = self.max_length
-
-        if self.choices:
-
-
-
-
-
-
+
-            params['choices'] = self.get_choices_default()
-        else:
-            field_objs = self.get_manipulator_field_objs()
@@ -347 +336 @@
-        return first_choice + lst
-
-    def get_choices_default(self):
-
-
-
-
+
-
-    def _get_val_from_obj(self, obj):
-        if obj:

a/django/db/models/fields/related.py

@@ -1 +1 @@
-from django.db import connection, transaction
-from django.db.models import signals, get_model
-, get_ul_class
+
-from django.db.models.related import RelatedObject
-from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy, string_concat, ungettext, ugettext as _
@@ -496 +496 @@
-
-    def prepare_field_objs_and_params(self, manipulator, name_prefix):
-        params = {'validator_list': self.validator_list[:], 'member_name': name_prefix + self.attname}
-
-
-
+
+
-        else:
-
-
-
-
+
-        params['choices'] = self.get_choices_default()
-        return field_objs, params
-
@@ -521 +517 @@
-        if not obj:
-            # In required many-to-one fields with only one available choice,
-            # select that one available choice. Note: For SelectFields
-
-
-
-
+
+
-            if not self.blank and self.choices:
-                choice_list = self.get_choices_default()
-
-
-
+
-                    return {self.attname: choice_list[1][0]}
-        return Field.flatten_data(self, follow, obj)
-
@@ -591 +583 @@
-    # ManyToManyField. This works for now.
-    def prepare_field_objs_and_params(self, manipulator, name_prefix):
-        params = {'validator_list': self.validator_list[:], 'member_name': name_prefix + self.attname}
-
-
-
+
+
-        else:
-
-
-
-
+
-        params['choices'] = self.get_choices_default()
-        return field_objs, params
-

a/django/newforms/widgets.py

@@ -438 +438 @@
-
-    def render(self):
-        """Outputs a <ul> for this set of radio fields."""
-
-
+
+
+
-
-class RadioSelect(Select):
-    renderer = RadioFieldRenderer

a/docs/admin.txt

@@ -35 +35 @@
-``ModelAdmin`` objects
-======================
-
+
+``radio_admin_fields``
+~~~~~~~~~~~~~~~~~~~~~~
+
+By default, Django's admin uses a select-box interface (<select>) for
+fields that are ``ForeignKey`` or have ``choices`` set. If a field is
+present in ``radio_admin_fields``, Django will use a radio-button interface
+instead. ``radio_admin_fields`` is a dictionary, keyed by field names.
+Values should be set to either django.contrib.admin.HORIZONTAL for a
+horizontal radio-button list, or django.contrib.admin.VERTICAL for a
+vertical presentation.
+
+Don't include a field in ``radio_admin_fields`` unless it's a ``ForeignKey``
+or has ``choices`` set.
+
+
-``AdminSite`` objects
-=====================
-

a/docs/model-api.txt

@@ -664 +664 @@
-``primary_key=True`` implies ``blank=False``, ``null=False`` and
-``unique=True``. Only one primary key is allowed on an object.
-
-``radio_admin``
-~~~~~~~~~~~~~~~
-
-By default, Django's admin uses a select-box interface (<select>) for
-fields that are ``ForeignKey`` or have ``choices`` set. If ``radio_admin``
-is set to ``True``, Django will use a radio-button interface instead.
-
-Don't use this for a field unless it's a ``ForeignKey`` or has ``choices``
-set.
-
-``unique``
-~~~~~~~~~~
-

a/tests/regressiontests/forms/forms.py

@@ -423 +423 @@
-zero-based index.
->>> f = FrameworkForm(auto_id='id_%s')
->>> print f['language']
-
+ id="id_language"
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
-</ul>
@@ -433 +433 @@
-ID of the *first* radio button.
->>> print f
-<tr><th><label for="id_name">Name:</label></th><td><input type="text" name="name" id="id_name" /></td></tr>
-
+ id="id_language"
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
-</ul></td></tr>
->>> print f.as_ul()
-<li><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></li>
-
+ id="id_language"
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
-</ul></li>
->>> print f.as_p()
-<p><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></p>
-
+ id="id_language"
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
-</ul></p>

a/tests/regressiontests/forms/regressions.py

@@ -40 +40 @@
-...     somechoice = ChoiceField(choices=GENDERS, widget=RadioSelect(), label=u'\xc5\xf8\xdf')
->>> f = SomeForm()
->>> f.as_p()
-
+ id="id_somechoice"
-
-Testing choice validation with UTF-8 bytestrings as input (these are the
-Russian abbreviations "мес." and "шт.".
@@ -56 +56 @@
->>> activate('ru')
->>> f = SomeForm({})
->>> f.as_p()
-
+ id="id_somechoice"
->>> deactivate()
-
-Deep copying translated text shouldn't raise an error

a/tests/regressiontests/forms/widgets.py

@@ -755 +755 @@
-# Attributes provided at instantiation are passed to the constituent inputs
->>> w = RadioSelect(attrs={'id':'foo'})
->>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')))
-
+ id="foo"
-<li><label><input checked="checked" type="radio" id="foo_0" value="J" name="beatle" /> John</label></li>
-<li><label><input type="radio" id="foo_1" value="P" name="beatle" /> Paul</label></li>
-<li><label><input type="radio" id="foo_2" value="G" name="beatle" /> George</label></li>
@@ -765 +765 @@
-# Attributes provided at render-time are passed to the constituent inputs
->>> w = RadioSelect()
->>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), attrs={'id':'bar'})
-
+ id="bar"
-<li><label><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label></li>
-<li><label><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label></li>
-<li><label><input type="radio" id="bar_2" value="G" name="beatle" /> George</label></li>

a/tests/regressiontests/modeladmin/models.py

@@ -4 +4 @@
-class Band(models.Model):
-    name = models.CharField(max_length=100)
-    bio = models.TextField()
+    def __unicode__(self):
+        return self.name
+
+class Gig(models.Model):
+    main_band = models.ForeignKey(Band, related_name='main_gigs')
+    opening_band = models.ForeignKey(Band, related_name='opening_gigs', blank=True)
+    day = models.CharField(max_length=3, choices=((1, 'Fri'), (2, 'Sat')))
+    transport = models.CharField(max_length=100, choices=((1, 'Plane'), (2, 'Train'), (3, 'Bus')), blank=True)
-
-
-__test__ = {'API_TESTS': """
-
-
+, HORIZONTAL, VERTICAL
->>> from django.contrib.admin.sites import AdminSite
-
-None of the following tests really depend on the content of the request, so
@@ -17 +25 @@
->>> request = None
-
->>> band = Band(name='The Doors', bio='')
+>>> band.save()
-
-Under the covers, the admin system will initialize ModelAdmin with a Model
-class and an AdminSite instance, so let's just go ahead and do that manually
@@ -84 +93 @@
->>> ma.form_change(request, band).base_fields.keys()
-['name']
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-"""
-}