From d470f28978d14e64849bfade517d796ab9a1e439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Thu, 7 Apr 2022 14:49:35 +0200
Subject: [PATCH] search: Remove unused default search app
---
README.md | 1 -
majak/settings/base.py | 1 -
majak/urls.py | 2 --
search/__init__.py | 0
search/templates/search/search.html | 38 -----------------------------
search/views.py | 37 ----------------------------
6 files changed, 79 deletions(-)
delete mode 100644 search/__init__.py
delete mode 100644 search/templates/search/search.html
delete mode 100644 search/views.py
diff --git a/README.md b/README.md
index 8e1ae0be..d2583839 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 8025d23f..f4085016 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 65c9fb04..a3107078 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 e69de29b..00000000
diff --git a/search/templates/search/search.html b/search/templates/search/search.html
deleted file mode 100644
index 5f222e5e..00000000
--- 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 40d08c06..00000000
--- 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,
- },
- )
--
GitLab