diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html index d11ded56e4586fd5699c38adcd6e157364253c41..dfb555e457daa0e70d1f047983ac79908c9a0b0a 100644 --- a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html +++ b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html @@ -9,7 +9,7 @@ <a href="{% url 'task-details-setstatus' task.pk 'archived' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a> <a href="{% url 'task-details-setstatus' task.pk 'finished' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a> <a href="{% url 'task-details-setstatus' task.pk 'suspended' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> suspended</a> -<a href="{% url 'task-discard-view' task.pk 'discard' 1 %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> Discard</a> +<a href="{% url 'task-discard-view' task.pk 'discard' 0 %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> Discard</a> <!-- <a href="{% url 'task-details-setstatus' task.pk 'discard' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> discard</a> diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 84b38dd8b339f08c7d76ce24cb1456e7299c023a..10cca3c97e9a89f56b46893148c3a6a40da8120d 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -1177,7 +1177,10 @@ def TaskDiscard(request, pk, new_status, page=0): task.save() # return to the failures page - return redirect_with_params('failures', '?page=' + page) + if int(page) == 0: + return redirect('task-details') + else: + return redirect_with_params('failures', '?page=' + page) else: # a GET means that the form should be presented to be filled in