From 74eeeb97306b941a410f2d0552a37edf67ef1777 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Mon, 19 Sep 2016 15:39:06 +0200 Subject: [PATCH] Fix error in sites filtering --- HISTORY.rst | 1 + djangocms_blog/admin.py | 10 +++++++--- requirements-test.txt | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 0493a78..f7cb14e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -19,6 +19,7 @@ History * Added plugins templateset. * Improved category admin to avoid circular relationships. * Dropped strict dependency on aldryn-search, haystack. Install separately for search support. +* Improved admin filtering. ****************** 0.8.9 (unreleased) diff --git a/djangocms_blog/admin.py b/djangocms_blog/admin.py index 7ff3fd8..2931056 100755 --- a/djangocms_blog/admin.py +++ b/djangocms_blog/admin.py @@ -45,8 +45,12 @@ class SiteListFilter(admin.SimpleListFilter): def queryset(self, request, queryset): try: - return queryset.filter(**self.used_parameters) - except ValidationError as e: + if 'sites' in self.used_parameters: + return queryset.on_site(Site.objects.get(pk=self.used_parameters['sites'])) + return queryset + except Site.DoesNotExist as e: # pragma: no cover + raise admin.options.IncorrectLookupParameters(e) + except ValidationError as e: # pragma: no cover raise admin.options.IncorrectLookupParameters(e) @@ -112,7 +116,7 @@ class PostAdmin(PlaceholderAdminMixin, FrontendEditableAdminMixin, try: from taggit_helpers.admin import TaggitListFilter filters.append(TaggitListFilter) - except ImportError: + except ImportError: # pragma: no cover try: from taggit_helpers import TaggitListFilter filters.append(TaggitListFilter) diff --git a/requirements-test.txt b/requirements-test.txt index 415d176..06adff7 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -11,3 +11,4 @@ wheel pysolr django-parler>=1.6 aldryn-search +django-taggit-helpers