From 2f086f24d782144b304091e72c66ca75c006a98a Mon Sep 17 00:00:00 2001
From: "Jannis M. Hoffmann" <jannis@fehcom.de>
Date: Sun, 8 Dec 2024 16:31:04 +0100
Subject: improve adding and retreiving url arguments from forms

---
 src/jwebmail/templates/_bot_nav.html | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/jwebmail/templates')

diff --git a/src/jwebmail/templates/_bot_nav.html b/src/jwebmail/templates/_bot_nav.html
index bd9e05a..d92d467 100644
--- a/src/jwebmail/templates/_bot_nav.html
+++ b/src/jwebmail/templates/_bot_nav.html
@@ -45,11 +45,9 @@
     {% if mail_folders|length > 1 %}
       <form action="{{ url_for('move', folder=folder) }}" id="move-mail" class=is-pulled-left method=POST>
         <input type=hidden name=csrf_token value="{{ csrf_token() }}">
-        <input type=hidden name=sort value="{{ request.args.sort }}">
-        <input type=hidden name=search value="{{ request.args.search }}">
-        <input type=hidden name=per_page value="{{ request.args.per_page }}">
-        <input type=hidden name=page_bound value="{{ request.args.page_bound }}">
-        <input type=hidden name=after_page value="{{ request.args.after_page }}">
+        {% for k, v in request.args.items() if v %}
+          <input type=hidden name="{{ k }}" value="{{ v }}">
+        {% endfor %}
         <div class="field has-addons">
           <div class=control>
             <div class=select>
@@ -73,11 +71,9 @@
       method=POST class="is-pulled-left ml-2">
 
       <input type=hidden name=csrf_token value="{{ csrf_token() }}">
-      <input type=hidden name=sort value="{{ request.args.sort }}">
-      <input type=hidden name=search value="{{ request.args.search }}">
-      <input type=hidden name=per_page value="{{ request.args.per_page }}">
-      <input type=hidden name=page_bound value="{{ request.args.page_bound }}">
-      <input type=hidden name=after_page value="{{ request.args.after_page }}">
+      {% for k, v in request.args.items() if v %}
+        <input type=hidden name="{{ k }}" value="{{ v }}">
+      {% endfor %}
       <div class=control>
         <input id=remove type=submit class=button value="{{ gettext('Remove') }}">
       </div>
-- 
cgit v1.2.3