mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: remove links from time field on failed builds

Browse Source 
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
2016-07-13 11:37:01 +01:00
committed by Richard Purdie
parent 9ed45f7974
commit dce5037646
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitbake/lib/toaster/toastergui/tables.py
View File

@@ -1197,9 +1197,13 @@ class BuildsTable(ToasterTable):
time_template = ''' time_template = '''
{% load projecttags %} {% 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}} {{data.timespent_seconds | sectohms}}
</a> {% endif %}
''' '''
image_files_template = ''' image_files_template = '''

11
bitbake/lib/toaster/toastergui/templates/builddashboard.html
View File

@@ -38,8 +38,15 @@
{% endif %} {% endif %}
<span class="pull-right"> <span class="pull-right">
Build time: Build time:
<a class="alert-link" href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> <span data-build-field="buildtime">
</span> {% 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%} {%endif%}
</div> </div>

10
bitbake/lib/toaster/toastergui/templates/mrb_section.html
View File

@@ -198,7 +198,15 @@
<!-- build time --> <!-- build time -->
<div class="col-md-3"> <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 --> <!-- rebuild button -->
<%include tmpl='#rebuild-template'/%> <%include tmpl='#rebuild-template'/%>