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/builds.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/builds.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/builds.html | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html b/bitbake/lib/toaster/toastergui/templates/builds.html index e9211affcd..00d1d4edd1 100644 --- a/bitbake/lib/toaster/toastergui/templates/builds.html +++ b/bitbake/lib/toaster/toastergui/templates/builds.html | |||
@@ -46,7 +46,11 @@ | |||
46 | <div class="row-fluid"> | 46 | <div class="row-fluid"> |
47 | <div class="alert"> | 47 | <div class="alert"> |
48 | <form class="no-results input-append" id="searchform"> | 48 | <form class="no-results input-append" id="searchform"> |
49 | <input id="search" name="search" class="input-xxlarge" type="text" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on btn" tabindex="-1"><i class="icon-remove"></i></a>{% endif %} | 49 | <input id="search" name="search" class="input-xxlarge" type="text" value=" |
50 | {% if request.GET.search %} | ||
51 | {{request.GET.search}} | ||
52 | {% endif %}"/> | ||
53 | {% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on btn" tabindex="-1"><i class="icon-remove"></i></a>{% endif %} | ||
50 | <button class="btn" type="submit" value="Search">Search</button> | 54 | <button class="btn" type="submit" value="Search">Search</button> |
51 | <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all builds</button> | 55 | <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all builds</button> |
52 | </form> | 56 | </form> |
@@ -60,8 +64,8 @@ | |||
60 | {% for build in objects %} | 64 | {% for build in objects %} |
61 | <tr class="data"> | 65 | <tr class="data"> |
62 | <td class="outcome"> | 66 | <td class="outcome"> |
63 | <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> | 67 | <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> |
64 | </td> | 68 | </td> |
65 | <td class="target">{% for t in build.target_set.all %} <a href="{% url "builddashboard" build.id %}"> {{t.target}} </a> <br />{% endfor %}</td> | 69 | <td class="target">{% for t in build.target_set.all %} <a href="{% url "builddashboard" build.id %}"> {{t.target}} </a> <br />{% endfor %}</td> |
66 | <td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td> | 70 | <td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td> |
67 | <td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on|date:"d/m/y H:i"}}</a></td> | 71 | <td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on|date:"d/m/y H:i"}}</a></td> |
@@ -77,19 +81,19 @@ | |||
77 | <a href="{% url "tasks" build.id %}?filter=outcome%3A4">{{exectask.count}} task{{exectask.count|pluralize}}</a> | 81 | <a href="{% url "tasks" build.id %}?filter=outcome%3A4">{{exectask.count}} task{{exectask.count|pluralize}}</a> |
78 | {%endif%} | 82 | {%endif%} |
79 | </td> | 83 | </td> |
80 | <td class="errors_no"> | 84 | <td class="errors.count"> |
81 | {% if build.errors_no %} | 85 | {% if build.errors.count %} |
82 | <a class="errors_no error" href="{% url "builddashboard" build.id %}#errors">{{build.errors_no}} error{{build.errors_no|pluralize}}</a> | 86 | <a class="errors.count error" href="{% url "builddashboard" build.id %}#errors">{{build.errors.count}} error{{build.errors.count|pluralize}}</a> |
83 | {%endif%} | 87 | {%endif%} |
84 | </td> | 88 | </td> |
85 | <td class="warnings_no">{% if build.warnings_no %}<a class="warnings_no warning" href="{% url "builddashboard" build.id %}#warnings">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a>{%endif%}</td> | 89 | <td class="warnings.count">{% if build.warnings.count %}<a class="warnings.count warning" href="{% url "builddashboard" build.id %}#warnings">{{build.warnings.count}} warning{{build.warnings.count|pluralize}}</a>{%endif%}</td> |
86 | <td class="time"><a href="{% url "buildtime" build.id %}">{{build.timespent|sectohms}}</a></td> | 90 | <td class="time"><a href="{% url "buildtime" build.id %}">{{build.timespent_seconds|sectohms}}</a></td> |
87 | <td class="output"> | 91 | <td class="output"> |
88 | {% if build.outcome == build.SUCCEEDED %} | 92 | {% if build.outcome == build.SUCCEEDED %} |
89 | <a href="{%url "builddashboard" build.id%}#images">{{fstypes|get_dict_value:build.id}}</a> | 93 | <a href="{%url "builddashboard" build.id%}#images">{{fstypes|get_dict_value:build.id}}</a> |
90 | {% endif %} | 94 | {% endif %} |
91 | </td> | 95 | </td> |
92 | <td> | 96 | <td> |
93 | <a href="{% url 'project' build.project.id %}">{{build.project.name}}</a> | 97 | <a href="{% url 'project' build.project.id %}">{{build.project.name}}</a> |
94 | </td> | 98 | </td> |
95 | </tr> | 99 | </tr> |