allow search to keep existing filters

Author: furlongm

util/templates/objectlist.html

@@ -6,7 +6,8 @@
 
 <div class="row">
   <div class="col-sm-10">
-    {% searchform terms %}
+    {% get_querydict request as querydict %}
+    {% searchform terms querydict %}
     {% gen_table page.object_list table_template %}
     <div class="centered">
       {% object_count page %}

util/templates/searchbar.html

@@ -3,6 +3,9 @@
   <form method="get">
     <div class="input-group">
       <input type="text" class="form-control input-sm" placeholder="Search" name="search" id="search" value="{{ terms }}">
+      {% for key, value in querydict.items %}
+        <input type="hidden" id="{{ key }}" name="{{ key }}" value="{{ value }}">
+      {% endfor %}
       <div class="input-group-btn">
         <button class="btn btn-primary btn-sm" type="submit">{% bootstrap_icon "search" %}</button>
       </div>

util/templatetags/common.py

@@ -85,6 +85,16 @@ def object_count(page):
     return f'{page.paginator.count} {name}'
 
 
+@register.simple_tag
+def get_querydict(request):
+    get = request.GET.copy()
+    if 'page' in get:
+        del get['page']
+    if 'search' in get:
+        del get['search']
+    return get
+
+
 @register.simple_tag
 def get_querystring(request):
     get = request.GET.copy()
@@ -94,9 +104,9 @@ def get_querystring(request):
 
 
 @register.simple_tag
-def searchform(terms):
+def searchform(terms, querydict):
     template = get_template('searchbar.html')
-    html = template.render({'post_url': '.', 'terms': terms})
+    html = template.render({'post_url': '.', 'terms': terms, 'querydict': querydict})
     return html