Annotation Management: keep filter for next pages

bit-bots · Dec 6, 2020 · 9a2ea2b · 9a2ea2b
1 parent b6ff146
commit 9a2ea2b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/imagetagger/imagetagger/annotations/templates/annotations/manage_annotations.html b/imagetagger/imagetagger/annotations/templates/annotations/manage_annotations.html
@@ -1,5 +1,6 @@
 {% extends 'base/base.html' %}
 {% load static %}
+{% load update_query %}
 {% block navblock %}
 <li><a href='{% url 'images:view_imageset' selected_image_set.id %}'>Imageset</a></li>
 {% endblock %}
@@ -98,17 +99,17 @@ <h4>
                 <span class="step-links">
                     <div class="btn-group" role="group" aria-label="btn-group">
                         {% if annotations.has_previous %}
-                            <a class="btn btn-default" href="?page=1">&laquo; first</a>
-                            <a class="btn btn-default" href="?page={{ annotations.previous_page_number }}">previous</a>
+                            <a class="btn btn-default" href="?{% update_query page=1 %}">&laquo; first</a>
+                            <a class="btn btn-default" href="?{% update_query page=annotations.previous_page_number %}">previous</a>
                         {% endif %}
                         {% if annotations.has_other_pages %}
                             <span class="current btn btn-default">
                                 Page {{ annotations.number }} of {{ annotations.paginator.num_pages }}
                             </span>
                         {% endif %}
                         {% if annotations.has_next %}
-                            <a class="btn btn-default" href="?page={{ annotations.next_page_number }}">next</a>
-                            <a class="btn btn-default" href="?page={{ annotations.paginator.num_pages }}">last &raquo;</a>
+                            <a class="btn btn-default" href="?{% update_query page=annotations.next_page_number %}">next</a>
+                            <a class="btn btn-default" href="?{% update_query page=annotations.paginator.num_pages %}">last &raquo;</a>
                         {% endif %}
                     </div>
                 </span>

diff --git a/imagetagger/imagetagger/annotations/templatetags/__init__.py b/imagetagger/imagetagger/annotations/templatetags/__init__.py
diff --git a/imagetagger/imagetagger/annotations/templatetags/update_query.py b/imagetagger/imagetagger/annotations/templatetags/update_query.py
@@ -0,0 +1,11 @@
+from django import template
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def update_query(context, **kwargs):
+    query = context['request'].GET.copy()
+    for k, v in kwargs.items():
+        query[k] = v
+    return query.urlencode()