From 237a404d3ec678d1088dcd0b3630a3ea67ce08ea Mon Sep 17 00:00:00 2001 From: Sebastián Magrí Date: Sun, 18 Nov 2012 20:51:05 -0430 Subject: [1.5.x] Fixed #19318 -- Ensured that the admin's SimpleListFilter options can be displayed as selected even if the lookup's first element is not a string. Backport of 88e17156393b --- django/contrib/admin/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py index 0a34f807b3..ff66d3e3f3 100644 --- a/django/contrib/admin/filters.py +++ b/django/contrib/admin/filters.py @@ -9,7 +9,7 @@ import datetime from django.db import models from django.core.exceptions import ImproperlyConfigured, ValidationError -from django.utils.encoding import smart_text +from django.utils.encoding import smart_text, force_text from django.utils.translation import ugettext_lazy as _ from django.utils import timezone from django.contrib.admin.util import (get_model_from_relation, @@ -102,7 +102,7 @@ class SimpleListFilter(ListFilter): } for lookup, title in self.lookup_choices: yield { - 'selected': self.value() == lookup, + 'selected': self.value() == force_text(lookup), 'query_string': cl.get_query_string({ self.parameter_name: lookup, }, []), -- cgit v1.3