Skip to content
Snippets Groups Projects
Commit ba1d77a1 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

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

parent 7cc49390
No related branches found
No related tags found
3 merge requests!143Query Page:,!141Master,!140Dev nico
<a href="{% url 'task-details' record.pk 0 %}" class="btn btn-primary btn-sm" role="button"><i class="fas fa-list"></i> Details</a>&nbsp; <a href="{% url 'task-details' record.pk 0 %}" class="btn btn-primary btn-sm" role="button"><i class="fas fa-list"></i> Details</a>&nbsp;
{% if record.resume %} {% 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 %} {% endif %}
{% if not record.resume %} {% 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 %} {% endif %}
\ No newline at end of file
...@@ -68,4 +68,5 @@ urlpatterns = [ ...@@ -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>/<page>', views.Hold, name='task-hold-resume'),
path('tasks/<int:pk>/hold/<hold_it>', 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
...@@ -476,6 +476,16 @@ def Hold(request,pk,hold_it,page=0): ...@@ -476,6 +476,16 @@ def Hold(request,pk,hold_it,page=0):
# redirect to tasks list # redirect to tasks list
return redirect('/atdb/?page='+page) 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 @login_required
def TaskSetStatus(request,pk,new_status,page=0): def TaskSetStatus(request,pk,new_status,page=0):
model = Task model = Task
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment