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] Signed-off-by: Elliot Smith <[email protected]> --- bitbake/lib/toaster/toastergui/tables.py | 18 +++++++++++++++++- .../toastergui/templates/builds-toastertable.html | 10 +++++----- .../lib/toaster/toastergui/templates/mrb_section.html | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index a0991ec..0941637 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -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() diff --git a/bitbake/lib/toaster/toastergui/templates/builds-toastertable.html b/bitbake/lib/toaster/toastergui/templates/builds-toastertable.html index 419d2b5..f7604fd 100644 --- a/bitbake/lib/toaster/toastergui/templates/builds-toastertable.html +++ b/bitbake/lib/toaster/toastergui/templates/builds-toastertable.html @@ -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' %} diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index bd8f991..52b3f1a 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html @@ -14,7 +14,7 @@ {% endif %} </h2> {% else %} - <div class="page-header"> + <div class="page-header top-air"> <h1> Latest builds </h1> -- Elliot Smith Software Engineer Intel OTC --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
