X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/802753926b75af4c173d2765e5f3777a559f7ebb..14002782e6b8c409c74492e0265c2c6c67d0071d:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 60f984a9d..e50e51a51 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -206,14 +206,17 @@ def _tags_starting_with(prefix, user): def search(request): tags = request.GET.get('tags', '') prefix = request.GET.get('q', '') - # Prefix must have at least 2 characters - if len(prefix) < 2: - return HttpResponse('') try: tag_list = models.Tag.get_tag_list(tags) except: tag_list = [] + + # Prefix must have at least 2 characters + if len(prefix) < 2: + return HttpResponseRedirect(reverse('catalogue.views.search_no_hits', + kwargs={'tags': '/'.join(tag.slug for tag in tag_list)} + )) result = _tags_starting_with(prefix, request.user) if len(result) > 0: @@ -227,9 +230,22 @@ def search(request): kwargs={'tags': '/'.join(tag.slug for tag in tag_list)} )) else: - return render_to_response('catalogue/search_no_hits.html', {'query':prefix, 'tags':tag_list}, - context_instance=RequestContext(request)) + return HttpResponseRedirect(reverse('catalogue.views.search_no_hits', + kwargs={'tags': '/'.join(tag.slug for tag in tag_list)} + )) + + +def search_no_hits(request, tags): + try: + tag_list = models.Tag.get_tag_list(tags) + except: + tag_list = [] + + return render_to_response('catalogue/search_no_hits.html', {'tags':tag_list}, + context_instance=RequestContext(request)) + +search_no_hits def tags_starting_with(request): prefix = request.GET.get('q', '')