minor changes in search
authorJan Szejko <janek37@gmail.com>
Fri, 15 Dec 2017 16:44:05 +0000 (17:44 +0100)
committerJan Szejko <janek37@gmail.com>
Fri, 15 Dec 2017 16:57:16 +0000 (17:57 +0100)
src/search/context_processors.py
src/search/views.py

index 6ad2fe9..63e3285 100644 (file)
@@ -7,4 +7,4 @@ from search.forms import SearchForm
 
 
 def search_form(request):
-    return {'search_form': SearchForm(reverse('search.views.hint')+'?max=10', request.GET)}
+    return {'search_form': SearchForm(reverse('search_hint') + '?max=10', request.GET)}
index 8542e51..64382e2 100644 (file)
@@ -7,11 +7,9 @@ from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.views.decorators import cache
 from django.http import HttpResponse, JsonResponse
-from django.utils.translation import ugettext as _
 
 from catalogue.utils import split_tags
 from catalogue.models import Book, Tag
-from pdcounter.models import Author as PDCounterAuthor, BookStub as PDCounterBook
 from search.index import Search, SearchResult
 from suggest.forms import PublishingSuggestForm
 import re
@@ -76,20 +74,20 @@ def hint(request):
         if limit < 1:
             limit = 20
 
+    authors = Tag.objects.filter(
+        category='author', name__iregex='\m' + prefix).only('name', 'id', 'slug', 'category')
     data = [
         {
             'label': author.name,
-            'category': _('author'),
             'id': author.id,
             'url': author.get_absolute_url(),
         }
-        for author in Tag.objects.filter(category='author', name__iregex=u'\m' + prefix)[:limit]
+        for author in authors[:limit]
     ]
     if len(data) < limit:
         data += [
             {
                 'label': '<cite>%s</cite>, %s' % (b.title, b.author_unicode()),
-                'category': _('book'),
                 'id': b.id,
                 'url': b.get_absolute_url()
             }