1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00

bitbake: toastergui: show recent builds on all builds page

The recent builds section was disabled while converting the
all builds page to ToasterTable.

Re-enable the recent builds area and add the data it requires
to the ToasterTable context.

[YOCTO #8738]

(Bitbake rev: d6df4545bd134a23c9bd3cd1ba3b61ddb26545e4)

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Elliot Smith
2016-01-15 13:00:52 +02:00
committed by Richard Purdie
parent 1a4b203ca5
commit b929889cdd
3 changed files with 23 additions and 7 deletions
+17 -1
View File
@@ -27,6 +27,7 @@ from django.db.models import Q, Max, Count
from django.conf.urls import url
from django.core.urlresolvers import reverse
from django.views.generic import TemplateView
import itertools
from toastergui.tablefilter import TableFilter, TableFilterActionToggle
@@ -887,7 +888,22 @@ class BuildsTable(ToasterTable):
self.static_context_extra['Task'] = Task
def get_context_data(self, **kwargs):
return super(BuildsTable, self).get_context_data(**kwargs)
context = super(BuildsTable, self).get_context_data(**kwargs)
# for the latest builds section
queryset = Build.objects.all()
finished_criteria = Q(outcome=Build.SUCCEEDED) | Q(outcome=Build.FAILED)
latest_builds = itertools.chain(
queryset.filter(outcome=Build.IN_PROGRESS).order_by("-started_on"),
queryset.filter(finished_criteria).order_by("-completed_on")[:3]
)
context['mru'] = list(latest_builds)
context['mrb_type'] = 'all'
return context
def setup_queryset(self, *args, **kwargs):
queryset = Build.objects.all()
@@ -3,13 +3,13 @@
{% block title %} All builds - Toaster {% endblock %}
{% block pagecontent %}
<div class="page-header top-air">
<h1 data-role="page-title"></h1>
</div>
<div class="row-fluid">
{# TODO need to pass this data to context #}
{#% include 'mrb_section.html' %#}
{% with mru=mru mrb_type=mrb_type %}
{% include 'mrb_section.html' %}
{% endwith %}
<h1 class="page-header top-air" data-role="page-title"></h1>
{% url 'builds' as xhr_table_url %}
{% include 'toastertable.html' %}
@@ -14,7 +14,7 @@
{% endif %}
</h2>
{% else %}
<div class="page-header">
<div class="page-header top-air">
<h1>
Latest builds
</h1>