diff --git a/atdb/taskdatabase/templates/query/action_buttons_per_row.html b/atdb/taskdatabase/templates/query/action_buttons_per_row.html index 6fae0ffc89dc2f0c6b6a4c84c6a329ee13f37cb9..8cebd0473126d486fec6877a0ff2d456764706f1 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/templates/query/set_multi_status_panel.html b/atdb/taskdatabase/templates/query/set_multi_status_panel.html index 2d3a71bedc791f37ed581e69d2d40ce2627cccd7..2328da1a792cdc2525614ce06c3a190b5af6a88d 100644 --- a/atdb/taskdatabase/templates/query/set_multi_status_panel.html +++ b/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> - <a href="{% url 'task-multi-hold' 'resume' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-play"></i> start</a> + <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> + <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> <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> <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> diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index fa8932cc6f8f973338a0fc03d5113d8094579ba1..c0720e8fcc2e48cd6fd43ee2581d46e17f1d17a6 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/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> diff --git a/atdb/taskdatabase/urls.py b/atdb/taskdatabase/urls.py index a940de3ce5a942eb018ab3e4b79147bc66f21356..6728fe0eaaa9634995356901ec2bbed89fc1a26f 100644 --- a/atdb/taskdatabase/urls.py +++ b/atdb/taskdatabase/urls.py @@ -64,8 +64,9 @@ 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'), + 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 76f2ec46f2c0ebadfdd1e96d08cf3bcae8c491e7..0ff3290be4c12bd879303aa78c59adc089915fc4 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -476,6 +476,17 @@ 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 @@ -599,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) @@ -611,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})