diff options
| author | David Reyna <David.Reyna@windriver.com> | 2015-09-29 08:15:19 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-29 14:11:00 +0100 |
| commit | ce9a7f1819a1897878ce154b3ee7e727a76165b0 (patch) | |
| tree | d348f02bb63a24e78cb56b3f1e31d5e2b6ccbc5a | |
| parent | 505979ab931e3a2a218d7030d6064987e8f9ff14 (diff) | |
| download | bitbake-ce9a7f1819a1897878ce154b3ee7e727a76165b0.zip | |
toaster: display most recent builds for projects
Display the most recent builds in the given project's build page.
[YOCTO #8186]
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/toaster/toastergui/templates/mrb_section.html | 16 | ||||
| -rw-r--r-- | lib/toaster/toastergui/templates/projectbuilds.html | 10 | ||||
| -rwxr-xr-x | lib/toaster/toastergui/views.py | 3 |
3 files changed, 21 insertions, 8 deletions
diff --git a/lib/toaster/toastergui/templates/mrb_section.html b/lib/toaster/toastergui/templates/mrb_section.html index b2c49fe3..2fefe4b0 100644 --- a/lib/toaster/toastergui/templates/mrb_section.html +++ b/lib/toaster/toastergui/templates/mrb_section.html @@ -3,13 +3,19 @@ {% load humanize %} -{%if mru.count > 0%} +{%if mru and mru.count > 0%} - <div class="page-header"> + {%if mrb_type == 'project' %} + <h2> + Latest project builds + </h2> + {% else %} + <div class="page-header"> <h1> - Latest builds - </h1> - </div> + Latest builds + </h1> + </div> + {% endif %} <div id="latest-builds"> {% for build in mru %} <div class="alert {%if build.outcome == build.SUCCEEDED%}alert-success{%elif build.outcome == build.FAILED%}alert-error{%else%}alert-info{%endif%} project-name "> diff --git a/lib/toaster/toastergui/templates/projectbuilds.html b/lib/toaster/toastergui/templates/projectbuilds.html index fc659a02..fde7e3b9 100644 --- a/lib/toaster/toastergui/templates/projectbuilds.html +++ b/lib/toaster/toastergui/templates/projectbuilds.html @@ -21,13 +21,17 @@ }); </script> + {% with mrb_type='project' %} + {% include "mrb_section.html" %} + {% endwith %} + <h2> {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %} - {{objects.paginator.count}} build{{objects.paginator.count|pluralize}} found + {{objects.paginator.count}} project build{{objects.paginator.count|pluralize}} found {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %} - No builds found + No project builds found {%else%} - Project builds + All project builds {%endif%} <i class="icon-question-sign get-help heading-help" title="This page lists all the builds for the current project"></i> </h2> diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index b7eddf41..9f16e8f7 100755 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -2904,6 +2904,9 @@ if True: context['project'] = prj _set_parameters_values(pagesize, orderby, request) + # add the most recent builds for this project + context['mru'] = _get_latest_builds(prj) + return context |