Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-05 14:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/torchbox/wagtail

Browse source
This commit is contained in:
Matt Westcott 2015-09-03 12:00:47 +01:00
commit d85b0041dc
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py
View file

@ -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()

4
wagtail/contrib/wagtailsearchpromotions/tests.py
View file

@ -71,6 +71,10 @@ class TestGetSearchPromotionsTemplateTag(TestCase):
search_picks = list(get_search_promotions("root page"))
self.assertEqual(search_picks, [pick])
def test_get_search_promotions_with_none_query_string(self):
search_picks = list(get_search_promotions(None))
self.assertEqual(search_picks, [])
class TestSearchPromotionsIndexView(TestCase, WagtailTestUtils):
def setUp(self):