Merge branch 'SDC-512-consistent-filtering' into 'master'

SDC-512 - improving filter mechanism

See merge request !249

atdb/taskdatabase/views.py

@@ -401,6 +401,7 @@ class ShowFailuresPage(ListView):
 # this provides a broad range of filters for the search_box in the GUI
 def get_filtered_tasks(request, pre_filtered_tasks=None):
     filtered_tasks=[]
+    filtered_tasks_as_list = None
 
     try:
         my_sort = request.session['sort']
@@ -408,7 +409,11 @@ def get_filtered_tasks(request, pre_filtered_tasks=None):
         my_sort = '-creationTime'
 
     # if there is already a 'filtered_tasks_as_list' on the session, then show that.
+    try:
         filtered_tasks_as_list = request.session['filtered_tasks_as_list']
+    except:
+        pass
+
     if filtered_tasks_as_list:
         if pre_filtered_tasks:
             filtered_tasks = pre_filtered_tasks.filter(id__in=filtered_tasks_as_list)
@@ -421,17 +426,23 @@ def get_filtered_tasks(request, pre_filtered_tasks=None):
             filtered_tasks = Task.objects.all()
 
         # check if there is a status filter active
+        try:
             status_filter = request.session['task_filter']
             if status_filter != 'all':
                 if type(status_filter) is list:
                     filtered_tasks = filtered_tasks.filter(status__in=status_filter)
                 else:
                     filtered_tasks = filtered_tasks.filter(status__icontains=status_filter)
+        except:
+            pass
 
         # check if the on_hold filter is active
+        try:
             onhold = request.session['task_onhold_filter']
             if onhold != None:
                 filtered_tasks = filtered_tasks.filter(resume=not onhold)
+        except:
+            pass
 
         search = request.GET.get('search_box', None)
         if (search is not None):