summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorVajrasky Kok <sky.kok@speaklikeaking.com>2013-11-09 12:17:23 +0800
committerAnssi Kääriäinen <akaariai@gmail.com>2013-11-19 09:14:22 +0200
commit68b540c97751f052a7622a7ab80a32a7d89d2aa2 (patch)
tree5d2c5dc95f185f872567e2928ccd5f4b5aa88fa8 /django
parent4fdd51b73240bf9c8d9472fcc45df699f0714755 (diff)
Fixed #21361 -- allowed access self.value() from SimpleListFilter lookup
Reviewed by Chris Medrela.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/filters.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py
index 4d970c2f8b..1f8cb5ed61 100644
--- a/django/contrib/admin/filters.py
+++ b/django/contrib/admin/filters.py
@@ -67,13 +67,13 @@ class SimpleListFilter(ListFilter):
raise ImproperlyConfigured(
"The list filter '%s' does not specify "
"a 'parameter_name'." % self.__class__.__name__)
+ if self.parameter_name in params:
+ value = params.pop(self.parameter_name)
+ self.used_parameters[self.parameter_name] = value
lookup_choices = self.lookups(request, model_admin)
if lookup_choices is None:
lookup_choices = ()
self.lookup_choices = list(lookup_choices)
- if self.parameter_name in params:
- value = params.pop(self.parameter_name)
- self.used_parameters[self.parameter_name] = value
def has_output(self):
return len(self.lookup_choices) > 0