diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-06-17 17:30:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-26 09:27:32 +0100 |
commit | 70c4eb8d3acaad267ee943ebfba793f9cc1c5ee6 (patch) | |
tree | 416f9dcf9c16014e1fc2b975a1de01b286847e25 /bitbake/lib/toaster/toastergui/templates/builddashboard.html | |
parent | 287b49a35b3f06b302ee199ed4b2d123f1aae58c (diff) | |
download | poky-70c4eb8d3acaad267ee943ebfba793f9cc1c5ee6.tar.gz |
bitbake: toaster: refactor build model
We remove the "timespent", "errors_no" and "warnings_no" fields
in favor of computing the needed values at runtime. This prevents
inconsistencies in the UI.
Also removeing all references to BuildRequests from the interface -
all build details now display in the build dashboard.
Minor fixes related to data logging.
(Bitbake rev: 44f37394ed3e4ca02f940be172fe4395b0ee0f7d)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/builddashboard.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/builddashboard.html | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index 47b8d7aa1f..bab8e388f5 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html | |||
@@ -23,22 +23,23 @@ | |||
23 | </strong> on | 23 | </strong> on |
24 | {{build.completed_on|date:"d/m/y H:i"}} | 24 | {{build.completed_on|date:"d/m/y H:i"}} |
25 | </span> | 25 | </span> |
26 | {% if build.warnings_no or build.errors_no %} | 26 | {% if build.warnings.count or build.errors.count %} |
27 | with | 27 | with |
28 | {% endif %} | 28 | {% endif %} |
29 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | 29 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} |
30 | {% if build.errors_no %} | 30 | {% if build.errors.count %} |
31 | <span > <i class="icon-minus-sign red"></i><strong><a href="#errors" class="error show-errors"> {{build.errors_no}} error{{build.errors_no|pluralize}}</a></strong></span> | 31 | <span > <i class="icon-minus-sign red"></i><strong><a href="#errors" class="error show-errors"> {{build.errors.count}} error{{build.errors.count|pluralize}}</a></strong></span> |
32 | {% endif %} | 32 | {% endif %} |
33 | {% if build.warnings_no %} | 33 | {% if build.warnings.count %} |
34 | {% if build.errors_no %} | 34 | {% if build.errors.count %} |
35 | and | 35 | and |
36 | {% endif %} | 36 | {% endif %} |
37 | <span > <i class="icon-warning-sign yellow"></i><strong><a href="#warnings" class="warning show-warnings"> {{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a></strong></span> | 37 | <span > <i class="icon-warning-sign yellow"></i><strong><a href="#warnings" class="warning show-warnings"> {{build.warnings.count}} warning{{build.warnings.count|pluralize}}</a></strong></span> |
38 | {% endif %} | 38 | {% endif %} |
39 | <span class="pull-right">Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent|sectohms }}</a> | 39 | <span class="pull-right">Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> |
40 | <a class="btn {%if build.outcome == build.SUCCEEDED%}btn-success{%else%}btn-danger{%endif%} pull-right log" href="{% url 'build_artifact' build.id "cookerlog" build.id %}">Download build log</a> | 40 | <a class="btn {%if build.outcome == build.SUCCEEDED%}btn-success{%else%}btn-danger{%endif%} pull-right log" href="{% url 'build_artifact' build.id "cookerlog" build.id %}">Download build log</a> |
41 | </span> | 41 | </span> |
42 | |||
42 | {%endif%} | 43 | {%endif%} |
43 | </div> | 44 | </div> |
44 | {% if build.toaster_exceptions.count > 0 %} | 45 | {% if build.toaster_exceptions.count > 0 %} |
@@ -52,14 +53,14 @@ | |||
52 | </div> | 53 | </div> |
53 | </div> | 54 | </div> |
54 | 55 | ||
55 | {% if build.errors_no %} | 56 | {% if build.errors.count %} |
56 | <div class="accordion span10 pull-right" id="errors"> | 57 | <div class="accordion span10 pull-right" id="errors"> |
57 | <div class="accordion-group"> | 58 | <div class="accordion-group"> |
58 | <div class="accordion-heading"> | 59 | <div class="accordion-heading"> |
59 | <a class="accordion-toggle error toggle-errors"> | 60 | <a class="accordion-toggle error toggle-errors"> |
60 | <h2 id="error-toggle"> | 61 | <h2 id="error-toggle"> |
61 | <i class="icon-minus-sign"></i> | 62 | <i class="icon-minus-sign"></i> |
62 | {{build.errors_no}} error{{build.errors_no|pluralize}} | 63 | {{build.errors.count}} error{{build.errors.count|pluralize}} |
63 | </h2> | 64 | </h2> |
64 | </a> | 65 | </a> |
65 | </div> | 66 | </div> |
@@ -241,14 +242,14 @@ | |||
241 | </div> | 242 | </div> |
242 | </div> | 243 | </div> |
243 | 244 | ||
244 | {% if build.warnings_no %} | 245 | {% if build.warnings.count %} |
245 | <div class="accordion span10 pull-right" id="warnings"> | 246 | <div class="accordion span10 pull-right" id="warnings"> |
246 | <div class="accordion-group"> | 247 | <div class="accordion-group"> |
247 | <div class="accordion-heading"> | 248 | <div class="accordion-heading"> |
248 | <a class="accordion-toggle warning toggle-warnings"> | 249 | <a class="accordion-toggle warning toggle-warnings"> |
249 | <h2 id="warning-toggle"> | 250 | <h2 id="warning-toggle"> |
250 | <i class="icon-warning-sign"></i> | 251 | <i class="icon-warning-sign"></i> |
251 | {{build.warnings_no}} warning{{build.warnings_no|pluralize}} | 252 | {{build.warnings.count}} warning{{build.warnings.count|pluralize}} |
252 | </h2> | 253 | </h2> |
253 | </a> | 254 | </a> |
254 | </div> | 255 | </div> |