Merge pull request #2196 from OpenEnergyPlatform/issue-2169-pagination-filter

Issue 2169 pagination filter

Author: wingechr

dataedit/templates/dataedit/dataedit_tablelist.html

@@ -59,20 +59,21 @@ <h1 class="main-header__title">
           {% if tables_paginated.has_previous %}
             <li class="page-item">
               <a class="page-link"
-                 href="?page={{ tables_paginated.previous_page_number }}"
+                 href="?{{ params_wo_page }}&page={{ tables_paginated.previous_page_number }}"
                  tabindex="-1"
                  aria-disabled="true">Previous</a>
             </li>
           {% endif %}
           <li class="page-item active">
-            <a class="page-link" href="?page={{ tables_paginated.number }}">
+            <a class="page-link"
+               href="?{{ params_wo_page }}&page={{ tables_paginated.number }}">
               {{ tables_paginated.number }}
             </a>
           </li>
           {% if tables_paginated.has_next %}
             <li class="page-item">
               <a class="page-link"
-                 href="?page={{ tables_paginated.next_page_number }}">Next</a>
+                 href="?{{ params_wo_page }}&page={{ tables_paginated.next_page_number }}">Next</a>
             </li>
           {% endif %}
         </ul>

dataedit/templates/dataedit/taggable_setting.html

@@ -9,34 +9,36 @@
        style="background:{{ t.color_hex }};
               color:{% readable_text_color t.color_hex %}">{{ t.name }}</a>
   {% endfor %}
-  <button data-bs-toggle="collapse"
-          data-bs-target="#tag_handler"
-          class="btn btn-add btn-circle">{% fa5_icon 'plus' 'fas' %}</button>
-  <div id="tag_handler" class="collapse">
-    <form action="{% url 'dataedit:tags-add' %}" method="post">
-      {% csrf_token %}
-      <h4>Choose tags to attach:</h4>
-      {% for t in all_tags %}
-        <span>
-          <input type="checkbox"
-                 class="hidden"
-                 name="tag_{{ t.pk }}"
-                 id="select_{{ t.pk }}"
-                 {% if t in selected %}checked{% endif %} />
-          <label class="form-label"
-                 style="background:{{ t.color_hex }};
-                        color:{% readable_text_color t.color_hex %}"
-                 class="btn tag"
-                 for="select_{{ t.pk }}">{{ t.name }}</label>
-        </span>
-      {% endfor %}
-      {% if table %}
-        <input type="hidden" name="table" value="{{ table }}" />
-      {% endif %}
-      <input type="submit" class="btn btn-success" value="Apply" />
-      <a type="button"
-         class="btn btn-info"
-         href="{% url 'dataedit:topic-list' %}">Edit</a>
-    </form>
-  </div>
+  {% if is_admin %}
+    <button data-bs-toggle="collapse"
+            data-bs-target="#tag_handler"
+            class="btn btn-add btn-circle">{% fa5_icon 'plus' 'fas' %}</button>
+    <div id="tag_handler" class="collapse">
+      <form action="{% url 'dataedit:tags-add' %}" method="post">
+        {% csrf_token %}
+        <h4>Choose tags to attach:</h4>
+        {% for t in all_tags %}
+          <span>
+            <input type="checkbox"
+                   class="hidden"
+                   name="tag_{{ t.pk }}"
+                   id="select_{{ t.pk }}"
+                   {% if t in selected %}checked{% endif %} />
+            <label class="form-label"
+                   style="background:{{ t.color_hex }};
+                          color:{% readable_text_color t.color_hex %}"
+                   class="btn tag"
+                   for="select_{{ t.pk }}">{{ t.name }}</label>
+          </span>
+        {% endfor %}
+        {% if table %}
+          <input type="hidden" name="table" value="{{ table }}" />
+        {% endif %}
+        <input type="submit" class="btn btn-success" value="Apply" />
+        <a type="button"
+           class="btn btn-info"
+           href="{% url 'dataedit:topic-list' %}">Edit</a>
+      </form>
+    </div>
+  {% endif %}
 </div>

dataedit/views.py

@@ -402,6 +402,11 @@ def tables_view(request: HttpRequest, topic: str) -> HttpResponse:
     searched_query_string = request.GET.get("query")
     searched_tag_ids = request.GET.getlist("tags")
 
+    # all query params without "page"
+    params_wo_page = request.GET.copy()
+    params_wo_page.pop("page", None)
+    params_wo_page = params_wo_page.urlencode()
+
     Tag.increment_usage_count_many(searched_tag_ids)
 
     # find all tables (layzy query set) in this topic
@@ -426,6 +431,7 @@ def tables_view(request: HttpRequest, topic: str) -> HttpResponse:
             "tables_paginated": tables_paginated,
             "query": searched_query_string,
             "tags": searched_tag_ids,
+            "params_wo_page": params_wo_page,
             "topic": topic,
             "doc_oem_builder_link": DOCUMENTATION_LINKS["oemetabuilder"],
         },

versions/changelogs/current.md

@@ -18,6 +18,7 @@ SPDX-License-Identifier: CC0-1.0
 - fixed year format in scenario bundles (#2091, #2102)
 - fix sorting of fact sheets (#1974)
 - fixed caching issues (#1818, #1822)
+- keep table filter when using pagination (#2169)
 
 ## Documentation updates