From e09ff151c54bce35483d0be744045cd42a5297b2 Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Tue, 1 Aug 2023 14:00:54 +0200
Subject: [PATCH] bugfix: return to details screen after discard from that page

---
 .../templates/taskdatabase/tasks/set_status_buttons.html     | 2 +-
 atdb/taskdatabase/views.py                                   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html
index d11ded56..dfb555e4 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>&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-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;
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 84b38dd8..10cca3c9 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
-- 
GitLab