X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/a04dc488f5fea78a2a51bde4b59b4aad50cf3204..4424d39a5d12ff6e16853b1aca23def0df33cc80:/src/api/handlers.py?ds=sidebyside diff --git a/src/api/handlers.py b/src/api/handlers.py index eb56e2014..159e4f235 100644 --- a/src/api/handlers.py +++ b/src/api/handlers.py @@ -19,6 +19,7 @@ from picture.models import Picture from picture.forms import PictureImportForm from stats.utils import piwik_track +from wolnelektury.utils import re_escape from . import emitters # Register our emitters @@ -300,7 +301,7 @@ class QuerySetProxy(models.QuerySet): class FilterBooksHandler(AnonymousBooksHandler): fields = book_tag_categories + [ - 'href', 'title', 'url', 'cover', 'cover_thumb', 'key', 'cover_source_image'] + 'href', 'title', 'url', 'cover', 'cover_thumb', 'slug', 'key', 'cover_source_image'] def read(self, request): key_sep = '$' @@ -334,6 +335,7 @@ class FilterBooksHandler(AnonymousBooksHandler): if (search_string is not None) and len(search_string) < 3: search_string = None if search_string: + search_string = re_escape(search_string) books_author = books.filter(cached_author__iregex='\m' + search_string) books_title = books.filter(title__iregex='\m' + search_string) books_title = books_title.exclude(id__in=list(books_author.values_list('id', flat=True)))