X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/a73444333e9557df72656fd1f49c01933ff21348..d850c26d30dc10b20278e537198e698b84c64e7b:/src/search/views.py diff --git a/src/search/views.py b/src/search/views.py index 8542e512f..7e512be14 100644 --- a/src/search/views.py +++ b/src/search/views.py @@ -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,21 @@ def hint(request): if limit < 1: limit = 20 + authors = Tag.objects.filter( + category='author', name_pl__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': '%s, %s' % (b.title, b.author_unicode()), - 'category': _('book'), + 'label': b.title, + 'author': b.author_unicode(), 'id': b.id, 'url': b.get_absolute_url() }