X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0b270a76ad73162f894285c360a0ee87fa84e536..044ee915f89f30b2935dbbcb4a5d5e4a91cbfca9:/src/search/views.py diff --git a/src/search/views.py b/src/search/views.py index dc7559fc9..459190d28 100644 --- a/src/search/views.py +++ b/src/search/views.py @@ -9,7 +9,7 @@ from sorl.thumbnail import get_thumbnail import catalogue.models import infopages.models -import picture.models +import social.models from .forms import SearchFilters import re import json @@ -48,14 +48,14 @@ def hint(request, mozhint=False, param='term'): { 'type': 'author', 'label': author.name, - 'url': author.get_absolute_gallery_url() if author.for_pictures else author.get_absolute_url(), + 'url': author.get_absolute_url(), 'img': get_thumbnail(author.photo, '72x72', crop='top').url if author.photo else '', } for author in authors[:limit - len(data)] ]) if request.user.is_authenticated and len(data) < limit: - tags = catalogue.models.Tag.objects.filter( - category='set', user=request.user, name_pl__iregex='\m' + prefix).only('name', 'id', 'slug', 'category') + tags = social.models.UserList.objects.filter( + user=request.user, name__iregex='\m' + prefix).only('name', 'id', 'slug') data.extend([ { 'type': 'set', @@ -71,7 +71,7 @@ def hint(request, mozhint=False, param='term'): { 'type': tag.category, 'label': tag.name, - 'url': tag.get_absolute_gallery_url() if tag.for_pictures else tag.get_absolute_url(), + 'url': tag.get_absolute_url(), } for tag in tags[:limit - len(data)] ]) @@ -101,19 +101,6 @@ def hint(request, mozhint=False, param='term'): 'img': get_thumbnail(b.cover_clean, '72x72').url if b.cover_clean else '', } ) - if len(data) < limit: - arts = picture.models.Picture.objects.filter( - title__iregex='\m' + prefix).only('title', 'id', 'slug') # img? - data.extend([ - { - 'type': 'art', - 'label': art.title, - 'author': art.author_unicode(), - 'url': art.get_absolute_url(), - 'img': get_thumbnail(art.image_file, '72x72').url if art.image_file else '', - } - for art in arts[:limit - len(data)] - ]) if len(data) < limit: infos = infopages.models.InfoPage.objects.filter( published=True,