diff --git a/README.md b/README.md index 8e1ae0be30b0afa123b1c1888ac1176fbf5f04c3..d25838396ae0a2947ebace2a1ddfe75ed47e6db9 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,6 @@ Rozšíření která používáme: ├── majak = Django projekt s konfigurací Majáku ├── shared = app se sdílenými static soubory a templaty pro weby ├── calendar_utils = app s modelem a utilitami na iCal kalendáře - ├── search = app pro fulltext search (default, asi se k ničemu nepoužívá) ├── tuning = app na tuning administračního rozhraní Majáku └── users = app s custom user modelem a SSO, apod. diff --git a/majak/settings/base.py b/majak/settings/base.py index 8025d23f23948b91325c334bc6205baf7724660b..f40850162fdbf825f32e0ecd5f304aad9b05d0d3 100644 --- a/majak/settings/base.py +++ b/majak/settings/base.py @@ -47,7 +47,6 @@ INSTALLED_APPS = [ "users", "pirates", "tuning", - "search", "regulace_konopi", "green_deal", "elections2021", diff --git a/majak/urls.py b/majak/urls.py index 65c9fb04fd688c2f195a8cd6c16e9472b18676d3..a310707833e3ae528542660fc2bdca6044ede7d0 100644 --- a/majak/urls.py +++ b/majak/urls.py @@ -8,7 +8,6 @@ from wagtail.core import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls from elections2021 import views as elections2021_views -from search import views as search_views handler404 = "shared.views.page_not_found" @@ -16,7 +15,6 @@ urlpatterns = [ path("django-admin/", admin.site.urls), path("admin/", include(wagtailadmin_urls)), path("documents/", include(wagtaildocs_urls)), - path("search/", search_views.search, name="search"), path( "export/elections2021/banner-orders.csv", elections2021_views.banner_orders_csv, diff --git a/search/__init__.py b/search/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/search/templates/search/search.html b/search/templates/search/search.html deleted file mode 100644 index 5f222e5e33e291b85f47b7471998d556b81b66f5..0000000000000000000000000000000000000000 --- a/search/templates/search/search.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "base.html" %} -{% load static wagtailcore_tags %} - -{% block body_class %}template-searchresults{% endblock %} - -{% block title %}Search{% endblock %} - -{% block content %} - <h1>Search</h1> - - <form action="{% url 'search' %}" method="get"> - <input type="text" name="query"{% if search_query %} value="{{ search_query }}"{% endif %}> - <input type="submit" value="Search" class="button"> - </form> - - {% if search_results %} - <ul> - {% for result in search_results %} - <li> - <h4><a href="{% pageurl result %}">{{ result }}</a></h4> - {% if result.search_description %} - {{ result.search_description }} - {% endif %} - </li> - {% endfor %} - </ul> - - {% if search_results.has_previous %} - <a href="{% url 'search' %}?query={{ search_query|urlencode }}&page={{ search_results.previous_page_number }}">Previous</a> - {% endif %} - - {% if search_results.has_next %} - <a href="{% url 'search' %}?query={{ search_query|urlencode }}&page={{ search_results.next_page_number }}">Next</a> - {% endif %} - {% elif search_query %} - No results found - {% endif %} -{% endblock %} diff --git a/search/views.py b/search/views.py deleted file mode 100644 index 40d08c0670ddb2e212e4d66aa287b8465e205598..0000000000000000000000000000000000000000 --- a/search/views.py +++ /dev/null @@ -1,37 +0,0 @@ -from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator -from django.shortcuts import render -from wagtail.core.models import Page -from wagtail.search.models import Query - - -def search(request): - search_query = request.GET.get("query", None) - page = request.GET.get("page", 1) - - # Search - if search_query: - search_results = Page.objects.live().search(search_query) - query = Query.get(search_query) - - # Record hit - query.add_hit() - else: - search_results = Page.objects.none() - - # Pagination - paginator = Paginator(search_results, 10) - try: - search_results = paginator.page(page) - except PageNotAnInteger: - search_results = paginator.page(1) - except EmptyPage: - search_results = paginator.page(paginator.num_pages) - - return render( - request, - "search/search.html", - { - "search_query": search_query, - "search_results": search_results, - }, - )