From 9e07c4b29eef45afca1583ff1723cd0c96725804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Tue, 19 Apr 2022 21:28:38 +0200
Subject: [PATCH] Minor improvements

---
 ram/portal/templates/includes/search.html |  2 +-
 ram/portal/templates/search.html          |  2 +-
 ram/portal/views.py                       | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ram/portal/templates/includes/search.html b/ram/portal/templates/includes/search.html
index 298367f..644f94b 100644
--- a/ram/portal/templates/includes/search.html
+++ b/ram/portal/templates/includes/search.html
@@ -1,5 +1,5 @@
           <form class="d-flex" action="/portal/search" method="post">
-            <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search" value="{{ search }}" name="search">
+            <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search" name="search">
             <button class="btn btn-outline-primary" type="submit">Search</button>
           </form>
 
diff --git a/ram/portal/templates/search.html b/ram/portal/templates/search.html
index bda6965..10e58ce 100644
--- a/ram/portal/templates/search.html
+++ b/ram/portal/templates/search.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
       {% block header %}
-        <h1 class="fw-light">Search: {{ search }}</h1>
+        <h1 class="fw-light">{{ filter | default_if_none:"Search" | title }}: {{ search }}</h1>
         <p class="lead text-muted">Results found: {{ rolling_stock | length }}</p>
       {% endblock %}
       {% block pagination %}
diff --git a/ram/portal/views.py b/ram/portal/views.py
index ad17d85..db756f0 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -79,7 +79,11 @@ class GetHomeFiltered(View):
         return render(
             request,
             "search.html",
-            {"search": search, "rolling_stock": rolling_stock},
+            {
+                "search": search,
+                "filter": _filter,
+                "rolling_stock": rolling_stock,
+            },
         )
 
     def post(self, request, _filter=None, page=1):
@@ -91,7 +95,11 @@ class GetHomeFiltered(View):
         return render(
             request,
             "search.html",
-            {"search": search, "rolling_stock": rolling_stock},
+            {
+                "search": search,
+                "filter": _filter,
+                "rolling_stock": rolling_stock,
+            },
         )