diff --git a/combo/apps/search/utils.py b/combo/apps/search/utils.py index 4957551a..addb1e5d 100644 --- a/combo/apps/search/utils.py +++ b/combo/apps/search/utils.py @@ -143,7 +143,7 @@ def search_site(request, query, pages=None, with_description=None): 'text': hit.title, 'rank': getattr(hit, 'rank', None), 'url': hit.url, - 'description': hit.page.description if with_description is True else '', + 'description': hit.page.description if (hit.page and with_description is True) else '', } ) seen[hit.url] = True diff --git a/tests/test_search.py b/tests/test_search.py index 273220b2..ce19ca3e 100644 --- a/tests/test_search.py +++ b/tests/test_search.py @@ -5,6 +5,7 @@ import mock from django.conf import settings from django.contrib.auth.models import AnonymousUser, User, Group +from django.contrib.contenttypes.models import ContentType from django.db import connection from django.test import override_settings from django.test.client import RequestFactory @@ -401,13 +402,20 @@ def test_search_api(app): result = result.replace('\n', '') assert '