From ba1d77a139f08ce0fea7e87f0361edea1b7fe4ae Mon Sep 17 00:00:00 2001 From: Nico Vermaas <vermaas@astron.nl> Date: Fri, 29 Oct 2021 14:19:10 +0200 Subject: [PATCH] keep filter when hold/start button is pressed in Query screen --- .../templates/query/action_buttons_per_row.html | 4 ++-- atdb/taskdatabase/urls.py | 1 + atdb/taskdatabase/views.py | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/atdb/taskdatabase/templates/query/action_buttons_per_row.html b/atdb/taskdatabase/templates/query/action_buttons_per_row.html index 6fae0ffc..8cebd047 100644 --- a/atdb/taskdatabase/templates/query/action_buttons_per_row.html +++ b/atdb/taskdatabase/templates/query/action_buttons_per_row.html @@ -1,9 +1,9 @@ <a href="{% url 'task-details' record.pk 0 %}" class="btn btn-primary btn-sm" role="button"><i class="fas fa-list"></i> Details</a> {% if record.resume %} - <a href="{% url 'task-hold-resume' record.pk 'hold' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-pause"></i> hold</a> + <a href="{% url 'query-hold-resume' record.pk 'hold' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-pause"></i> hold</a> {% endif %} {% if not record.resume %} - <a href="{% url 'task-hold-resume' record.pk 'resume' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-play"></i> start</a> + <a href="{% url 'query-hold-resume' record.pk 'resume' request.GET %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-play"></i> start</a> {% endif %} \ No newline at end of file diff --git a/atdb/taskdatabase/urls.py b/atdb/taskdatabase/urls.py index a940de3c..f5b83c22 100644 --- a/atdb/taskdatabase/urls.py +++ b/atdb/taskdatabase/urls.py @@ -68,4 +68,5 @@ urlpatterns = [ 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'), + path('tasks/<int:pk>/query-hold/<hold_it>/<query_params>', views.HoldQuery, name='query-hold-resume'), ] \ No newline at end of file diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 76f2ec46..75c0b078 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -476,6 +476,16 @@ def Hold(request,pk,hold_it,page=0): # redirect to tasks list return redirect('/atdb/?page='+page) + +def HoldQuery(request,pk,hold_it,query_params): + model = Task + task = Task.objects.get(pk=pk) + task.resume = (hold_it == 'resume') + task.save() + + 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 -- GitLab