diff options
| author |   Elliot Smith <elliot.smith@intel.com> | 2016-07-13 11:37:01 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-11 00:09:26 +0100 |
| commit | dce503764653051ddb1b3d67eb7d6059b8d31f92 (patch) | |
| tree | 84afd9f5c9f14439f976bb49e2d7cddf2c27c342 /bitbake/lib/toaster/toastergui | |
| parent | 9ed45f79745207f96dbd3cb6d9ef40ea8fcde42a (diff) | |
| download | openembedded-core-contrib-dce503764653051ddb1b3d67eb7d6059b8d31f92.tar.gz | |
bitbake: toaster: remove links from time field on failed builds
Failed builds don't have any time data recorded for them,
so the time field in the builds table, the time shown
in the recent builds area, and the build time shown in
the build dashboard should not be links for failed builds.
[YOCTO #8443]
(Bitbake rev: 6f9c472d95ee800da079f6b828b956d9f8c67ce6)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/tables.py | 8 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/builddashboard.html | 11 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/mrb_section.html | 10 |
3 files changed, 24 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 79673f5dab..969eb04aaa 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -1197,9 +1197,13 @@ class BuildsTable(ToasterTable): time_template = ''' {% load projecttags %} - <a href="{% url "buildtime" data.id %}"> + {% if data.outcome == extra.Build.SUCCEEDED %} + <a href="{% url "buildtime" data.id %}"> + {{data.timespent_seconds | sectohms}} + </a> + {% else %} {{data.timespent_seconds | sectohms}} - </a> + {% endif %} ''' image_files_template = ''' diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index 07fc26c6dd..61ae583d23 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html @@ -38,8 +38,15 @@ {% endif %} <span class="pull-right"> Build time: - <a class="alert-link" href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> - </span> + <span data-build-field="buildtime"> + {% if build.outcome == build.SUCCEEDED %} + <a href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> + {% else %} + {{ build.timespent_seconds|sectohms }} + {% endif %} + </span> + </span> + {%endif%} </div> diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index 38a72f9afb..b761ffe1df 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html @@ -198,7 +198,15 @@ <!-- build time --> <div class="col-md-3"> - Build time: <a class="alert-link" href="<%:buildtime_url%>"><%:buildtime%></a> + Build time: + + <span data-role="data-recent-build-buildtime-field"> + <%if state == 'Succeeded'%> + <a class="alert-link" href="<%:buildtime_url%>"><%:buildtime%></a> + <%else%> + <%:buildtime%> + <%/if%> + </span> <!-- rebuild button --> <%include tmpl='#rebuild-template'/%> |