From e01cada04fc0e1f1b364b72783f3ece09dba950d Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Sep 2015 10:17:36 +0100 Subject: [PATCH] Fix crash in get_search_promotions templatetag --- .../templatetags/wagtailsearchpromotions_tags.py | 6 +++++- wagtail/contrib/wagtailsearchpromotions/tests.py | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py b/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py index 06a2d56f8..0b2929c1e 100644 --- a/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py +++ b/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py @@ -1,6 +1,7 @@ from django import template from wagtail.wagtailsearch.models import Query +from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion register = template.Library() @@ -8,4 +9,7 @@ register = template.Library() @register.assignment_tag() def get_search_promotions(search_query): - return Query.get(search_query).editors_picks.all() + if search_query: + return Query.get(search_query).editors_picks.all() + else: + return SearchPromotion.objects.none() diff --git a/wagtail/contrib/wagtailsearchpromotions/tests.py b/wagtail/contrib/wagtailsearchpromotions/tests.py index 66a047ceb..6149e0199 100644 --- a/wagtail/contrib/wagtailsearchpromotions/tests.py +++ b/wagtail/contrib/wagtailsearchpromotions/tests.py @@ -1,5 +1,3 @@ -import unittest - from django.test import TestCase from django.core.urlresolvers import reverse @@ -73,7 +71,6 @@ class TestGetSearchPromotionsTemplateTag(TestCase): search_picks = list(get_search_promotions("root page")) self.assertEqual(search_picks, [pick]) - @unittest.expectedFailure def test_get_search_promotions_with_none_query_string(self): search_picks = list(get_search_promotions(None)) self.assertEqual(search_picks, [])