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

bugfix: return to details screen after discard from that page

parent 73b171fa
Branches
No related tags found
No related merge requests found
Pipeline #54891 passed
...@@ -9,7 +9,7 @@ ...@@ -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>&nbsp; <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>&nbsp;
<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>&nbsp; <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>&nbsp;
<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>&nbsp; <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>&nbsp;
<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>&nbsp; <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>&nbsp;
......
...@@ -1177,6 +1177,9 @@ def TaskDiscard(request, pk, new_status, page=0): ...@@ -1177,6 +1177,9 @@ def TaskDiscard(request, pk, new_status, page=0):
task.save() task.save()
# return to the failures page # return to the failures page
if int(page) == 0:
return redirect('task-details')
else:
return redirect_with_params('failures', '?page=' + page) return redirect_with_params('failures', '?page=' + page)
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment