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

bitbake: toaster: change UI to show tasks

Browse Source 
Changed toaster UI to show tasks if they're specified for the
builds and use them when restarting builds.

[YOCTO #7442]

(Bitbake rev: 3c196c15f0ae4c6ac2b92e0a75562962f3da0089)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2015-09-22 10:34:54 +01:00
committed by Richard Purdie
parent 08000eb27e
commit f6a70adcfb
3 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bitbake/lib/toaster/toastergui/templates/builds.html
View File

@@ -66,7 +66,17 @@
<td class="outcome">
<a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a> &nbsp;
</td>
<td class="target">{% for t in build.target_set.all %} <a href="{% url "builddashboard" build.id %}"> {{t.target}} </a> <br />{% endfor %}</td>
<td class="target">
{% for t in build.target_set.all %}
<a href="{% url "builddashboard" build.id %}">
{% if t.task %}
{{t.target}}:{{t.task}}
{% else %}
{{t.target}}
{% endif %}
</a> <br />
{% endfor %}
</td>
<td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td>
<td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on|date:"d/m/y H:i"}}</a></td>
<td class="completed_on"><a href="{% url "builddashboard" build.id %}">{{build.completed_on|date:"d/m/y H:i"}}</a></td>

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

@@ -26,12 +26,25 @@
{% endif %}
{% if build.target_set.all.count > 0 %}
<span data-toggle="tooltip"
{%if build.target_set.all.count > 1%}
title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"
{%endif%}
{% if build.target_set.all.count > 1 %}
title="Targets:
{% for target in build.target_set.all %}
{% if target.task %}
{{target.target}}:{{target.task}}
{% else %}
{{target.target}}
{% endif %}
{% endfor %}"
{% endif %}
>
{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%}
{% if build.target_set.all.0.task %}
{{build.target_set.all.0.target}}:{{build.target_set.all.0.task}}
{% else %}
{{build.target_set.all.0.target}}
{% endif %}
{% if build.target_set.all.count > 1 %}
(+ {{build.target_set.all.count|add:"-1"}})
{% endif %}
</span>
{% endif %}
{%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}

12
bitbake/lib/toaster/toastergui/templates/projectbuilds.html
View File

@@ -66,7 +66,17 @@
{% endif %}
</td>
<td class="target">{% for t in build.target_set.all %} <a href="{% url "builddashboard" build.id %}"> {{t.target}} </a> <br />{% endfor %}</td>
<td class="target">
{% for t in build.target_set.all %}
<a href="{% url "builddashboard" build.id %}">
{% if t.task %}
{{t.target}}:{{t.task}}
{% else %}
{{t.target}}
{% endif %}
</a> <br />
{% endfor %}
</td>
<td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td>
<td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on|date:"d/m/y H:i"}}</a></td>
<td class="completed_on"><a href="{% url "builddashboard" build.id %}">{{build.completed_on|date:"d/m/y H:i"}}</a></td>