diff --git a/django/contrib/admin/filterspecs.py b/django/contrib/admin/filterspecs.py index d6a4a0b..2076524 100644 --- a/django/contrib/admin/filterspecs.py +++ b/django/contrib/admin/filterspecs.py @@ -15,18 +15,19 @@ import datetime class FilterSpec(object): filter_specs = [] - def __init__(self, f, request, params, model, model_admin): + def __init__(self, f, request, params, model, model_admin, field_path=None): self.field = f self.params = params + self.field_path = field_path or f.name def register(cls, test, factory): cls.filter_specs.append((test, factory)) register = classmethod(register) - def create(cls, f, request, params, model, model_admin): + def create(cls, f, request, params, model, model_admin, field_path=None): for test, factory in cls.filter_specs: if test(f): - return factory(f, request, params, model, model_admin) + return factory(f, request, params, model, model_admin, field_path=field_path) create = classmethod(create) def has_output(self): @@ -52,13 +53,13 @@ class FilterSpec(object): return mark_safe("".join(t)) class RelatedFilterSpec(FilterSpec): - def __init__(self, f, request, params, model, model_admin): - super(RelatedFilterSpec, self).__init__(f, request, params, model, model_admin) + def __init__(self, f, request, params, model, model_admin, field_path=None): + super(RelatedFilterSpec, self).__init__(f, request, params, model, model_admin, field_path=field_path) if isinstance(f, models.ManyToManyField): self.lookup_title = f.rel.to._meta.verbose_name else: self.lookup_title = f.verbose_name - self.lookup_kwarg = '%s__%s__exact' % (f.name, f.rel.to._meta.pk.name) + self.lookup_kwarg = '%s__%s__exact' % (self.field_path, f.rel.to._meta.pk.name) self.lookup_val = request.GET.get(self.lookup_kwarg, None) self.lookup_choices = f.rel.to._default_manager.all() @@ -81,9 +82,9 @@ class RelatedFilterSpec(FilterSpec): FilterSpec.register(lambda f: bool(f.rel), RelatedFilterSpec) class ChoicesFilterSpec(FilterSpec): - def __init__(self, f, request, params, model, model_admin): - super(ChoicesFilterSpec, self).__init__(f, request, params, model, model_admin) - self.lookup_kwarg = '%s__exact' % f.name + def __init__(self, f, request, params, model, model_admin, field_path=None): + super(ChoicesFilterSpec, self).__init__(f, request, params, model, model_admin, field_path=field_path) + self.lookup_kwarg = '%s__exact' % self.field_path self.lookup_val = request.GET.get(self.lookup_kwarg, None) def choices(self, cl): @@ -98,10 +99,10 @@ class ChoicesFilterSpec(FilterSpec): FilterSpec.register(lambda f: bool(f.choices), ChoicesFilterSpec) class DateFieldFilterSpec(FilterSpec): - def __init__(self, f, request, params, model, model_admin): - super(DateFieldFilterSpec, self).__init__(f, request, params, model, model_admin) + def __init__(self, f, request, params, model, model_admin, field_path=None): + super(DateFieldFilterSpec, self).__init__(f, request, params, model, model_admin, field_path=field_path) - self.field_generic = '%s__' % self.field.name + self.field_generic = '%s__' % self.field_path self.date_params = dict([(k, v) for k, v in params.items() if k.startswith(self.field_generic)]) @@ -111,14 +112,14 @@ class DateFieldFilterSpec(FilterSpec): self.links = ( (_('Any date'), {}), - (_('Today'), {'%s__year' % self.field.name: str(today.year), - '%s__month' % self.field.name: str(today.month), - '%s__day' % self.field.name: str(today.day)}), - (_('Past 7 days'), {'%s__gte' % self.field.name: one_week_ago.strftime('%Y-%m-%d'), - '%s__lte' % f.name: today_str}), - (_('This month'), {'%s__year' % self.field.name: str(today.year), - '%s__month' % f.name: str(today.month)}), - (_('This year'), {'%s__year' % self.field.name: str(today.year)}) + (_('Today'), {'%s__year' % self.field_path: str(today.year), + '%s__month' % self.field_path: str(today.month), + '%s__day' % self.field_path: str(today.day)}), + (_('Past 7 days'), {'%s__gte' % self.field_path: one_week_ago.strftime('%Y-%m-%d'), + '%s__lte' % self.field_path: today_str}), + (_('This month'), {'%s__year' % self.field_path: str(today.year), + '%s__month' % self.field_path: str(today.month)}), + (_('This year'), {'%s__year' % self.field_path: str(today.year)}) ) def title(self): @@ -133,10 +134,10 @@ class DateFieldFilterSpec(FilterSpec): FilterSpec.register(lambda f: isinstance(f, models.DateField), DateFieldFilterSpec) class BooleanFieldFilterSpec(FilterSpec): - def __init__(self, f, request, params, model, model_admin): - super(BooleanFieldFilterSpec, self).__init__(f, request, params, model, model_admin) - self.lookup_kwarg = '%s__exact' % f.name - self.lookup_kwarg2 = '%s__isnull' % f.name + def __init__(self, f, request, params, model, model_admin, field_path=None): + super(BooleanFieldFilterSpec, self).__init__(f, request, params, model, model_admin, field_path=field_path) + self.lookup_kwarg = '%s__exact' % self.field_path + self.lookup_kwarg2 = '%s__isnull' % self.field_path self.lookup_val = request.GET.get(self.lookup_kwarg, None) self.lookup_val2 = request.GET.get(self.lookup_kwarg2, None) @@ -159,21 +160,22 @@ FilterSpec.register(lambda f: isinstance(f, models.BooleanField) or isinstance(f # if a field is eligible to use the BooleanFieldFilterSpec, that'd be much # more appropriate, and the AllValuesFilterSpec won't get used for it. class AllValuesFilterSpec(FilterSpec): - def __init__(self, f, request, params, model, model_admin): - super(AllValuesFilterSpec, self).__init__(f, request, params, model, model_admin) - self.lookup_val = request.GET.get(f.name, None) - self.lookup_choices = model_admin.queryset(request).distinct().order_by(f.name).values(f.name) + def __init__(self, f, request, params, model, model_admin, field_path=None): + super(AllValuesFilterSpec, self).__init__(f, request, params, model, model_admin, field_path=field_path) + self.lookup_val = request.GET.get(self.field_path, None) + #self.lookup_choices = model_admin.queryset(request).distinct().order_by(f.name).values(f.name) + self.lookup_choices = model._default_manager.all().distinct().order_by(f.name).values(f.name) def title(self): return self.field.verbose_name def choices(self, cl): yield {'selected': self.lookup_val is None, - 'query_string': cl.get_query_string({}, [self.field.name]), + 'query_string': cl.get_query_string({}, [self.field_path]), 'display': _('All')} for val in self.lookup_choices: val = smart_unicode(val[self.field.name]) yield {'selected': self.lookup_val == val, - 'query_string': cl.get_query_string({self.field.name: val}), + 'query_string': cl.get_query_string({self.field_path: val}), 'display': val} FilterSpec.register(lambda f: True, AllValuesFilterSpec) diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py index 9b9cefa..fcde368 100644 --- a/django/contrib/admin/validation.py +++ b/django/contrib/admin/validation.py @@ -265,7 +265,16 @@ def _check_isdict(cls, label, obj): def _check_field_exists(cls, model, opts, label, field): try: - return opts.get_field(field) + if '__' in field: + f = None + m = model + path = field.split('__') + for field_name in path[:-1]: + f = model._meta.get_field(field_name) + model = f.rel.to + return opts.get_field(path[0]) + else: + return opts.get_field(field) except models.FieldDoesNotExist: raise ImproperlyConfigured("`%s.%s` refers to " "field `%s` that is missing from model `%s`." diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 116d9d4..eb27561 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -69,9 +69,20 @@ class ChangeList(object): def get_filters(self, request): filter_specs = [] if self.list_filter and not self.opts.one_to_one_field: - filter_fields = [self.lookup_opts.get_field(field_name) for field_name in self.list_filter] - for f in filter_fields: - spec = FilterSpec.create(f, request, self.params, self.model, self.model_admin) + lookup_opts = self.lookup_opts + for filter_name in self.list_filter: + if '__' in filter_name: + f = None + model = self.model + path = filter_name.split('__') + for field_name in path[:-1]: + f = model._meta.get_field(field_name) + model = f.rel.to + f = model._meta.get_field(path[-1]) + spec = FilterSpec.create(f, request, self.params, model, self.model_admin, field_path=filter_name) + else: + f = lookup_opts.get_field(filter_name) + spec = FilterSpec.create(f, request, self.params, self.model, self.model_admin) if spec and spec.has_output(): filter_specs.append(spec) return filter_specs, bool(filter_specs)