Commit ee17cabb authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Fixed #9969: choices with options groups (added in [7977]) now work correctly... 

Fixed #9969: choices with options groups (added in [7977]) now work correctly in the admin with list_display and list_filter. Thanks, ramiro.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a2dec37c

django/contrib/admin/filterspecs.py

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ class ChoicesFilterSpec(FilterSpec): 
        yield {'selected': self.lookup_val is None,

               'query_string': cl.get_query_string({}, [self.lookup_kwarg]),

               'display': _('All')}

        for k, v in self.field.choices:

        for k, v in self.field.flatchoices:

            yield {'selected': smart_unicode(k) == self.lookup_val,

                    'query_string': cl.get_query_string({self.lookup_kwarg: k}),

                    'display': v}

django/contrib/admin/templatetags/admin_list.py

+2 −2
Original line number Diff line number Diff line
@@ -205,8 +205,8 @@ def items_for_result(cl, result, form): 
                    result_repr = EMPTY_CHANGELIST_VALUE

            # Fields with choices are special: Use the representation

            # of the choice.

            elif f.choices:

                result_repr = dict(f.choices).get(field_val, EMPTY_CHANGELIST_VALUE)

            elif f.flatchoices:

                result_repr = dict(f.flatchoices).get(field_val, EMPTY_CHANGELIST_VALUE)

            else:

                result_repr = escape(field_val)

        if force_unicode(result_repr) == '':

tests/regressiontests/admin_views/customadmin.py

+1 −0
Original line number Diff line number Diff line
@@ -28,3 +28,4 @@ site = Admin2(name="admin2") 
site.register(models.Article, models.ArticleAdmin)

site.register(models.Section, inlines=[models.ArticleInline])

site.register(models.Thing, models.ThingAdmin)

site.register(models.Fabric, models.FabricAdmin)

tests/regressiontests/admin_views/fixtures/admin-views-fabrics.xml

0 → 100644
+12 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<django-objects version="1.0">

  <object pk="1" model="admin_views.fabric">

    <field type="CharField" name="surface">x</field>

  </object>

  <object pk="2" model="admin_views.fabric">

    <field type="CharField" name="surface">y</field>

  </object>

  <object pk="3" model="admin_views.fabric">

    <field type="CharField" name="surface">plain</field>

  </object>

</django-objects>

tests/regressiontests/admin_views/models.py

+16 −0
Original line number Diff line number Diff line
@@ -135,6 +135,21 @@ class Thing(models.Model): 
class ThingAdmin(admin.ModelAdmin):

    list_filter = ('color',)



class Fabric(models.Model):

    NG_CHOICES = (

        ('Textured', (

                ('x', 'Horizontal'),

                ('y', 'Vertical'),

            )

        ),

        ('plain', 'Smooth'),

    )

    surface = models.CharField(max_length=20, choices=NG_CHOICES)



class FabricAdmin(admin.ModelAdmin):

    list_display = ('surface',)

    list_filter = ('surface',)



class Person(models.Model):

    GENDER_CHOICES = (

        (1, "Male"),
@@ -283,6 +298,7 @@ admin.site.register(ExternalSubscriber, ExternalSubscriberAdmin) 
admin.site.register(Podcast, PodcastAdmin)

admin.site.register(Parent, ParentAdmin)

admin.site.register(EmptyModel, EmptyModelAdmin)

admin.site.register(Fabric, FabricAdmin)



# We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.

# That way we cover all four cases: