From 0d4d05de14ff761a945c5bc3e615503a04f9fb5a Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Sun, 27 Nov 2022 18:51:07 +0100
Subject: [PATCH] validation per sas_id instead of per task
---
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
atdb/taskdatabase/views.py | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index e37428da..9fcee8dd 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 25 November 2022
+ <p class="footer"> Version 27 November 2022
</div>
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index a5eeba1e..b83a5c66 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -469,9 +469,8 @@ def get_filtered_tasks(request, pre_filtered_tasks=None, distinct=None):
if distinct:
# this does not seem to work, the distinct tasks are not sorted.
- my_sorted_tasks = filtered_tasks.order_by(distinct,my_sort)
- my_sorted_tasks = my_sorted_tasks.distinct(distinct)
- return my_sorted_tasks
+ my_distinct_tasks = filtered_tasks.order_by(distinct,my_sort).distinct(distinct)
+ return filtered_tasks.filter(id__in=my_distinct_tasks).order_by(my_sort)
else:
return filtered_tasks.order_by(my_sort)
--
GitLab