keep filter when multi hold/start is pressed in Query screen

atdb/taskdatabase/templates/query/set_multi_status_panel.html

@@ -8,8 +8,8 @@
                  <p>Click to 'multi change' Status for all these tasks</p>
                  <table>
                     <tr>
-                     <a href="{% url 'task-multi-hold' 'hold' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-pause"></i> hold</a>&nbsp;
-                     <a href="{% url 'task-multi-hold' 'resume' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-play"></i> start</a>&nbsp;
+                     <a href="{% url 'task-multi-hold' 'hold' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-pause"></i> hold</a>&nbsp;
+                     <a href="{% url 'task-multi-hold' 'resume' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-play"></i> start</a>&nbsp;
 
                      <a href="{% url 'task-multi-setstatus' 'defined' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>&nbsp;
                      <a href="{% url 'task-multi-setstatus' 'staged' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>&nbsp;

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -80,7 +80,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </div>
     </div>
-    <p class="footer"> Version 1.0.0 (29 oct 2021 - 13:00)
+    <p class="footer"> Version 1.0.0 (29 oct 2021 - 14:00)
 
 </div>
 

atdb/taskdatabase/urls.py

@@ -64,7 +64,7 @@ urlpatterns = [
     path('tasks/task-set-onhold-filter/<onhold>', views.TaskSetOnHoldFilter, name='task-set-onhold-filter'),
     path('tasks/<int:pk>/set_status/<new_status>/<query_params>', views.TaskSetStatusTables2, name = 'task-setstatus'),
     path('tasks/set_status_multi/<new_status>/<query_params>', views.TaskMultiStatus, name='task-multi-setstatus'),
-    path('tasks/set_multi_hold/<onhold>', views.TaskMultiHold, name='task-multi-hold'),
+    path('tasks/set_multi_hold/<onhold>/<query_params>', views.TaskMultiHold, name='task-multi-hold'),
 
     path('tasks/<int:pk>/hold/<hold_it>/<page>', views.Hold, name='task-hold-resume'),
     path('tasks/<int:pk>/hold/<hold_it>', views.Hold, name='task-hold-resume'),

atdb/taskdatabase/views.py

@@ -486,6 +486,7 @@ def HoldQuery(request,pk,hold_it,query_params):
     current_query_params = convert_query_params_to_url(query_params)
     return redirect('/atdb/query/?' + current_query_params)
 
+
 @login_required
 def TaskSetStatus(request,pk,new_status,page=0):
     model = Task
@@ -609,7 +610,7 @@ def TaskMultiStatus(request, new_status, query_params):
 
 
 @login_required
-def TaskMultiHold(request, onhold):
+def TaskMultiHold(request, onhold, query_params):
     # get the list of id's from the session
     query_list_of_ids = request.session['query_list_of_ids']
     count = len(query_list_of_ids)
@@ -621,7 +622,13 @@ def TaskMultiHold(request, onhold):
             task.resume = (onhold == 'resume')
             task.save()
 
-        return redirect('/atdb/query')
+        current_query_params = request.session['current_query_params']
+        return redirect('/atdb/query?'+current_query_params)
+
+    # add the current query parameters to the session so that they survive
+    # the request/response to the confirmation page (which has other query parameters)
+    current_query_params = convert_query_params_to_url(query_params)
+    request.session['current_query_params'] = current_query_params
 
     return render(request, "query/confirm_multi_change.html",{'new_value': onhold, 'count' : count})