diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index e37428dadef3a9c020ad72d55a6b649865938604..9fcee8dde687a5f48c80dce2d54ce912e2b37d49 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 a5eeba1e26a4f00aa6afe4ae6103ba0879c05156..b83a5c66075b9fac494c189f7cd7ab016085795f 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)