From 5a6797a6c2fc891dd2ee5745938798cff7293c52 Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Mon, 21 Aug 2023 08:17:35 +0200
Subject: [PATCH] bugfix in bugfix on archived page (shouldn't show 1 task per
sas_id)
---
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
atdb/taskdatabase/views.py | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index d7b2ae07..86ad7df0 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -31,7 +31,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 18 Aug 2023
+ <p class="footer"> Version 21 Aug 2023
</div>
{% include 'taskdatabase/refresh.html' %}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index c55d37d7..f6c8ea3d 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -459,11 +459,10 @@ class ShowFinishedPage(ListView):
@silk_profile(name='ShowFinishedPage')
def get_queryset(self):
- ##archived_tasks = Task.objects.filter(status=State.FINISHED.value)
- ##tasks = get_filtered_tasks(self.request, archived_tasks, "sas_id")
-
- tasks = get_filtered_tasks(self.request, None, "sas_id").filter(status=State.FINISHED.value)
+ ###archived_tasks = Task.objects.filter(status=State.FINISHED.value)
+ ###tasks = get_filtered_tasks(self.request, archived_tasks)
+ tasks = get_filtered_tasks(self.request).filter(status=State.FINISHED.value)
paginator = Paginator(tasks, config.TASKS_PER_PAGE) # Show 50 tasks per page
page = self.request.GET.get('page')
--
GitLab