summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-09-22 10:34:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 22:41:04 +0100
commit3c196c15f0ae4c6ac2b92e0a75562962f3da0089 (patch)
treeca32ce59eca50d813dd7bdf181beba0f2d3646b9 /lib
parentaab4aff75eefb31aa53885d7735feee5daa294aa (diff)
downloadbitbake-3c196c15f0ae4c6ac2b92e0a75562962f3da0089.zip
toaster: change UI to show tasks
Changed toaster UI to show tasks if they're specified for the builds and use them when restarting builds. [YOCTO #7442] 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>
Diffstat (limited to 'lib')
-rw-r--r--lib/toaster/toastergui/templates/builds.html12
-rw-r--r--lib/toaster/toastergui/templates/mrb_section.html23
-rw-r--r--lib/toaster/toastergui/templates/projectbuilds.html12
3 files changed, 40 insertions, 7 deletions
diff --git a/lib/toaster/toastergui/templates/builds.html b/lib/toaster/toastergui/templates/builds.html
index c0d0c64c..2b35b010 100644
--- a/lib/toaster/toastergui/templates/builds.html
+++ b/lib/toaster/toastergui/templates/builds.html
@@ -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>
diff --git a/lib/toaster/toastergui/templates/mrb_section.html b/lib/toaster/toastergui/templates/mrb_section.html
index 396fb8ed..13e2d0e4 100644
--- a/lib/toaster/toastergui/templates/mrb_section.html
+++ b/lib/toaster/toastergui/templates/mrb_section.html
@@ -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 %}
diff --git a/lib/toaster/toastergui/templates/projectbuilds.html b/lib/toaster/toastergui/templates/projectbuilds.html
index 27cfcd7d..fc659a02 100644
--- a/lib/toaster/toastergui/templates/projectbuilds.html
+++ b/lib/toaster/toastergui/templates/projectbuilds.html
@@ -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>