Commit 8c2094ee91a3903ce160e8d44448e74da739f924
1 parent
81d42b1b
Exists in
master
and in
39 other branches
Using whoosh as search engine for tests
Showing
4 changed files
with
17 additions
and
1 deletions
Show diff stats
colab/accounts/views.py
| @@ -3,6 +3,8 @@ | @@ -3,6 +3,8 @@ | ||
| 3 | 3 | ||
| 4 | from collections import OrderedDict | 4 | from collections import OrderedDict |
| 5 | 5 | ||
| 6 | +from haystack.exceptions import SearchBackendError | ||
| 7 | + | ||
| 6 | from django.conf import settings | 8 | from django.conf import settings |
| 7 | from django.contrib import messages | 9 | from django.contrib import messages |
| 8 | from django.db import transaction | 10 | from django.db import transaction |
| @@ -106,7 +108,10 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView): | @@ -106,7 +108,10 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView): | ||
| 106 | for filter_or in fields_or_lookup: | 108 | for filter_or in fields_or_lookup: |
| 107 | sqs = sqs.filter_or(**filter_or).exclude(type='thread') | 109 | sqs = sqs.filter_or(**filter_or).exclude(type='thread') |
| 108 | 110 | ||
| 109 | - context['results'] = sqs.order_by('-modified', '-created')[:10] | 111 | + try: |
| 112 | + context['results'] = sqs.order_by('-modified', '-created')[:10] | ||
| 113 | + except SearchBackendError: | ||
| 114 | + context['results'] = sqs.order_by('-modified')[:10] | ||
| 110 | 115 | ||
| 111 | email_pks = [addr.pk for addr in user.emails.iterator()] | 116 | email_pks = [addr.pk for addr in user.emails.iterator()] |
| 112 | query = Message.objects.filter(from_address__in=email_pks) | 117 | query = Message.objects.filter(from_address__in=email_pks) |
| @@ -0,0 +1 @@ | @@ -0,0 +1 @@ | ||
| 1 | +Whoosh==2.5.7 |