- tasks = Task.objects.filter(job__owner=request.user) \
- .select_related('job').prefetch_related('allocations__nodes') \
- .order_by('-job__submission_time', '-submission_time')
+ tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \
+ .select_related('job').prefetch_related('allocations__nodes')
+
+ filters = FiltersForm(request.GET)
+ selected_filters = []
+ if filters.is_valid():
+ keywords = filters.cleaned_data['keywords']
+ status = filters.cleaned_data['status']
+ host = filters.cleaned_data['host']
+ submission = filters.cleaned_data['submission']
+ finish = filters.cleaned_data['finish']
+
+ if keywords:
+ and_query = Q()
+
+ for q in keywords.split():
+ or_query = Q()
+ for field in search_fields:
+ or_query |= Q(**{field + '__icontains': q})
+ and_query &= or_query
+
+ tasks = tasks.filter(and_query)
+ selected_filters.append((keywords, 'keywords', keywords))
+
+ if status:
+ statuses = []
+ for s in status:
+ si = int(s)
+ statuses.extend(FiltersForm.STATUS_MAP[si])
+ selected_filters.append((FiltersForm.STATUS_CHOICES_DICT[si], 'status', s))
+
+ tasks = tasks.filter(status__in=statuses)
+
+ if host:
+ tasks = tasks.filter(allocations__host_name__in=host)
+
+ host_dict = dict(filters.fields['host'].choices)
+ for h in host:
+ selected_filters.append((host_dict[h], 'host', h))