[bitbake-devel] [PATCH 12/14] toaster: tasks trigger the select related tables before ordering
Alex DAMIAN
alexandru.damian at intel.com
Tue Mar 17 13:28:04 UTC 2015
From: Michael Wood <michael.g.wood at intel.com>
In two of the cases the data is changed from a QuerySet to a sorted list
so we aren't able to use the QuerySet api at this point, moving it
before the data type is changed fixes this.
[YOCTO #7404]
Signed-off-by: Michael Wood <michael.g.wood at intel.com>
---
lib/toaster/toastergui/views.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 26c8760..ea47d96 100755
--- a/lib/toaster/toastergui/views.py
+++ b/lib/toaster/toastergui/views.py
@@ -877,7 +877,10 @@ def tasks_common(request, build_id, variant, task_anchor):
return _redirect_parameters( variant, request.GET, mandatory_parameters, build_id = build_id)
(filter_string, search_term, ordering_string) = _search_tuple(request, Task)
queryset_all = Task.objects.filter(build=build_id).exclude(order__isnull=True).exclude(outcome=Task.OUTCOME_NA)
+ queryset_all = queryset_all.select_related("recipe", "build")
+
queryset_with_search = _get_queryset(Task, queryset_all, None , search_term, ordering_string, 'order')
+
if ordering_string.startswith('outcome'):
queryset = _get_queryset(Task, queryset_all, filter_string, search_term, 'order:+', 'order')
queryset = sorted(queryset, key=lambda ur: (ur.outcome_text), reverse=ordering_string.endswith('-'))
@@ -887,7 +890,6 @@ def tasks_common(request, build_id, variant, task_anchor):
else:
queryset = _get_queryset(Task, queryset_all, filter_string, search_term, ordering_string, 'order')
- queryset = queryset.select_related("recipe", "build")
# compute the anchor's page
if anchor:
--
1.9.1
More information about the bitbake-devel
mailing list