summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-05-19 18:44:50 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 11:59:45 +0100
commit6fab4cb701cc67db9fd18c30a60fed2483831667 (patch)
tree11ccee4f453efbbf0cc3d44079c447ce33116e9c
parente5aa569d475347e89636f6bf677d40df4455d027 (diff)
downloadpoky-6fab4cb701cc67db9fd18c30a60fed2483831667.tar.gz
bitbake: toaster-gui: Show task name for the builds in /builds
Task name was only shown for the latest builds in project view. Now it should be shown also in builds view. (Bitbake rev: 6492349d50a2048b1cbebab482bfd075bb48dd96) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/toastergui/templates/brtargets.html20
-rw-r--r--bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html12
2 files changed, 25 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/brtargets.html b/bitbake/lib/toaster/toastergui/templates/brtargets.html
new file mode 100644
index 0000000000..4ebd05879a
--- /dev/null
+++ b/bitbake/lib/toaster/toastergui/templates/brtargets.html
@@ -0,0 +1,20 @@
1<span data-toggle="tooltip"
2 {% if buildrequest.brtarget_set.all.count > 1 %}
3 title="Targets:
4 {% for target in buildrequest.brtarget_set.all %}
5 {% if target.task %}
6 {{target.target}}:{{target.task}}
7 {% else %}
8 {{target.target}}
9 {% endif %}
10 {%endfor%}"
11 {%endif%}>
12 {% if buildrequest.brtarget_set.all.0.task %}
13 {{buildrequest.brtarget_set.all.0.target}}:{{buildrequest.brtarget_set.all.0.task}}
14 {% else %}
15 {{buildrequest.brtarget_set.all.0.target}}
16 {% endif %}
17 {% if buildrequest.brtarget_set.all.count > 1 %}
18 (+ {{buildrequest.brtarget_set.all.count|add:"-1"}})
19 {% endif %}
20</span>
diff --git a/bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html b/bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html
index a6d4ac66fc..abcc0bb58f 100644
--- a/bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html
+++ b/bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html
@@ -26,8 +26,7 @@
26 {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} 26 {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}
27 <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}"> 27 <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}">
28 {% endif %} 28 {% endif %}
29 <span data-toggle="tooltip" {%if build.target_set.all.count > 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} 29 {% include "brtargets.html" %}
30 </span>
31 {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} 30 {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}
32 </a> 31 </a>
33 {% endif %} 32 {% endif %}
@@ -84,7 +83,7 @@
84 {% if buildrequest.state == buildrequest.REQ_FAILED %} 83 {% if buildrequest.state == buildrequest.REQ_FAILED %}
85 <div class="span3 lead"> 84 <div class="span3 lead">
86 <a href="{%url 'buildrequestdetails' buildrequest.project.id buildrequest.pk%}" class="error"> 85 <a href="{%url 'buildrequestdetails' buildrequest.project.id buildrequest.pk%}" class="error">
87 <span data-toggle="tooltip" {%if buildrequest.brtarget_set.all.count > 1%}title="Targets: {%for target in buildrequest.brtarget_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{buildrequest.brtarget_set.all.0.target}} {%if buildrequest.brtarget_set.all.count > 1%}(+ {{buildrequest.brtarget_set.all.count|add:"-1"}}){%endif%} </span> 86 {% include "brtargets.html" %}
88 </a> 87 </a>
89 </div> 88 </div>
90 <div class="span2 lead"> 89 <div class="span2 lead">
@@ -113,8 +112,7 @@
113 {% elif buildrequest.state == buildrequest.REQ_QUEUED %} 112 {% elif buildrequest.state == buildrequest.REQ_QUEUED %}
114 113
115 <div class="lead span5"> 114 <div class="lead span5">
116 115 {% include "brtargets.html" %}
117 <span data-toggle="tooltip" {%if buildrequest.brtarget_set.all.count > 1%}title="Targets: {%for target in buildrequest.brtarget_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{buildrequest.brtarget_set.all.0.target}} {%if buildrequest.brtarget_set.all.count > 1%}(+ {{buildrequest.brtarget_set.all.count|add:"-1"}}){%endif%} </span>
118 </div> 116 </div>
119 <div class="span4 lead">Build queued 117 <div class="span4 lead">Build queued
120 <i title="This build will start as soon as a build server is available" class="icon-question-sign get-help get-help-blue heading-help" data-toggle="tooltip"></i> 118 <i title="This build will start as soon as a build server is available" class="icon-question-sign get-help get-help-blue heading-help" data-toggle="tooltip"></i>
@@ -124,7 +122,7 @@
124 {% elif buildrequest.state == buildrequest.REQ_CREATED %} 122 {% elif buildrequest.state == buildrequest.REQ_CREATED %}
125 123
126 <div class="lead span3"> 124 <div class="lead span3">
127 <span data-toggle="tooltip" {%if buildrequest.brtarget_set.all.count > 1%}title="Targets: {%for target in buildrequest.brtarget_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{buildrequest.brtarget_set.all.0.target}} {%if buildrequest.brtarget_set.all.count > 1%}(+ {{buildrequest.brtarget_set.all.count|add:"-1"}}){%endif%} </span> 125 {% include "brtargets.html" %}
128 </div> 126 </div>
129 <div class="span6" > 127 <div class="span6" >
130 <span class="lead">Creating build</span> 128 <span class="lead">Creating build</span>
@@ -133,7 +131,7 @@
133 {% elif buildrequest.state == buildrequest.REQ_INPROGRESS %} 131 {% elif buildrequest.state == buildrequest.REQ_INPROGRESS %}
134 132
135 <div class="lead span5"> 133 <div class="lead span5">
136 <span data-toggle="tooltip" {%if buildrequest.brtarget_set.all.count > 1%}title="Targets: {%for target in buildrequest.brtarget_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{buildrequest.brtarget_set.all.0.target}} {%if buildrequest.brtarget_set.all.count > 1%}(+ {{buildrequest.brtarget_set.all.count|add:"-1"}}){%endif%} </span> 134 {% include "brtargets.html" %}
137 </div> 135 </div>
138 <div class="span4 lead"> 136 <div class="span4 lead">
139 Checking out layers 137 Checking out layers