summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui/templates
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-07-13 11:37:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-11 00:09:26 +0100
commitdce503764653051ddb1b3d67eb7d6059b8d31f92 (patch)
tree84afd9f5c9f14439f976bb49e2d7cddf2c27c342 /bitbake/lib/toaster/toastergui/templates
parent9ed45f79745207f96dbd3cb6d9ef40ea8fcde42a (diff)
downloadpoky-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/templates')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/builddashboard.html11
-rw-r--r--bitbake/lib/toaster/toastergui/templates/mrb_section.html10
2 files changed, 18 insertions, 3 deletions
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 @@
38 {% endif %} 38 {% endif %}
39 <span class="pull-right"> 39 <span class="pull-right">
40 Build time: 40 Build time:
41 <a class="alert-link" href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> 41 <span data-build-field="buildtime">
42 </span> 42 {% if build.outcome == build.SUCCEEDED %}
43 <a href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a>
44 {% else %}
45 {{ build.timespent_seconds|sectohms }}
46 {% endif %}
47 </span>
48 </span>
49
43 {%endif%} 50 {%endif%}
44</div> 51</div>
45 52
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 @@
198 198
199 <!-- build time --> 199 <!-- build time -->
200 <div class="col-md-3"> 200 <div class="col-md-3">
201 Build time: <a class="alert-link" href="<%:buildtime_url%>"><%:buildtime%></a> 201 Build time:
202
203 <span data-role="data-recent-build-buildtime-field">
204 <%if state == 'Succeeded'%>
205 <a class="alert-link" href="<%:buildtime_url%>"><%:buildtime%></a>
206 <%else%>
207 <%:buildtime%>
208 <%/if%>
209 </span>
202 210
203 <!-- rebuild button --> 211 <!-- rebuild button -->
204 <%include tmpl='#rebuild-template'/%> 212 <%include tmpl='#rebuild-template'/%>