From 0805922e4a132eb156056cea843c42841aaac7ac Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 17 Feb 2014 14:09:43 +0000 Subject: [PATCH] Removed document search --- wagtail/wagtaildocs/admin_urls.py | 1 - wagtail/wagtaildocs/views/documents.py | 34 +------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/wagtail/wagtaildocs/admin_urls.py b/wagtail/wagtaildocs/admin_urls.py index 574668137b..834ca44fb9 100644 --- a/wagtail/wagtaildocs/admin_urls.py +++ b/wagtail/wagtaildocs/admin_urls.py @@ -6,7 +6,6 @@ urlpatterns = patterns('wagtail.wagtaildocs.views', url(r'^add/$', 'documents.add', name='wagtaildocs_add_document'), url(r'^edit/(\d+)/$', 'documents.edit', name='wagtaildocs_edit_document'), url(r'^delete/(\d+)/$', 'documents.delete', name='wagtaildocs_delete_document'), - url(r'^search/$', 'documents.search', name='wagtaildocs_search'), url(r'^chooser/$', 'chooser.chooser', name='wagtaildocs_chooser'), url(r'^chooser/(\d+)/$', 'chooser.document_chosen', name='wagtaildocs_document_chosen'), diff --git a/wagtail/wagtaildocs/views/documents.py b/wagtail/wagtaildocs/views/documents.py index 5d668a2bd6..f7d5768e93 100644 --- a/wagtail/wagtaildocs/views/documents.py +++ b/wagtail/wagtaildocs/views/documents.py @@ -140,36 +140,4 @@ def delete(request, document_id): return render(request, "wagtaildocs/documents/confirm_delete.html", { 'document': doc, - }) - - -@permission_required('wagtaildocs.add_document') -def search(request): - documents = [] - q = None - is_searching = False - - if 'q' in request.GET: - form = SearchForm(request.GET) - if form.is_valid(): - q = form.cleaned_data['q'] - - is_searching = True - documents = Document.search(q, results_per_page=20, prefetch_tags=True) - else: - form = SearchForm() - - if request.is_ajax(): - return render(request, "wagtaildocs/documents/results.html", { - 'documents': documents, - 'is_searching': is_searching, - 'search_query': q - }) - else: - return render(request, "wagtaildocs/documents/index.html", { - 'form': form, - 'documents': documents, - 'is_searching': True, - 'search_query': q, - 'popular_tags': Document.popular_tags(), - }) + }) \ No newline at end of file