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>
This commit is contained in:
Elliot Smith authored and Richard Purdie committed 2016-08-11 00:09:26 +01:00
1 parent 9ed45f7974
commit dce5037646
3 files changed
+24 -5

No files matched your search

+6 -2
View File
@@ -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 = '''
@@ -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>
@@ -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'/%>