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:38 +0100 |
| commit | d48b7ef607372488c1bf50762e4ca21773bf1e9a (patch) | |
| tree | 6a78925e8d9accc14654e36a78e65ca3f3a9cf43 /bitbake/lib | |
| parent | f902dc646dbfdf31fded69a425fb88944a7d8fe3 (diff) | |
| download | openembedded-core-contrib-d48b7ef607372488c1bf50762e4ca21773bf1e9a.tar.gz | |
bitbake: toaster: display most recent builds for projects
Display the most recent builds in the given project's build page.
[YOCTO #8186]
(Bitbake rev: ce9a7f1819a1897878ce154b3ee7e727a76165b0)
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>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/mrb_section.html | 16 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projectbuilds.html | 10 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 3 |
3 files changed, 21 insertions, 8 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index b2c49fe365..2fefe4b0f7 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/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/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html index fc659a02bb..fde7e3b9da 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html +++ b/bitbake/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/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index b7eddf411d..9f16e8f76f 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/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 |