diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index dc6415008d0fa8d383c45c6a83d1fc9909c72572..bd3fb485ff468d090075e124b725861a9a84320b 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -295,8 +295,11 @@ class Task(models.Model): """ try: for task in Task.objects.filter(sas_id=self.sas_id): - if task.archive['sas_id_archived']: - return task.archive['sas_id_archived'] + try: + if task.archive['sas_id_archived']: + return task.archive['sas_id_archived'] + except: + pass except: return None diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index b54b8e711f0511cef726a0c7d720fa991d27315a..e7c21a2061eaf7ef91135e9581b2c15bcb161402 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -553,6 +553,7 @@ def get_filtered_tasks(request, pre_filtered_tasks=None, distinct=None): # check filtered_tasks on the session # if it is at its max limit, then this is not a query targeted at 1 SAS_ID. # in that case don't apply the filter, so that all SAS_ID's show up on the page. + # nv: 15jan2024, Vlad didn't like this new behaviour try: filtered_tasks_on_session = len(request.session['filtered_tasks_as_list']) if filtered_tasks_on_session != settings.QUERY_LIMIT_MULTI_CHANGE: