diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/projectbuilds.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projectbuilds.html | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html index 646755b183..f1db2f1504 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html +++ b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html | |||
@@ -16,8 +16,8 @@ | |||
16 | <script> | 16 | <script> |
17 | // initialize the date range controls | 17 | // initialize the date range controls |
18 | $(document).ready(function () { | 18 | $(document).ready(function () { |
19 | date_init('created','{{last_date_from}}','{{last_date_to}}','{{dateMin_created}}','{{dateMax_created}}','{{daterange_selected}}'); | 19 | date_init('created','{{last_date_from}}','{{last_date_to}}','{{dateMin_started_on}}','{{dateMax_started_on}}','{{daterange_selected}}'); |
20 | date_init('updated','{{last_date_from}}','{{last_date_to}}','{{dateMin_updated}}','{{dateMax_updated}}','{{daterange_selected}}'); | 20 | date_init('updated','{{last_date_from}}','{{last_date_to}}','{{dateMin_completed_on}}','{{dateMax_completed_on}}','{{daterange_selected}}'); |
21 | }); | 21 | }); |
22 | </script> | 22 | </script> |
23 | 23 | ||
@@ -28,7 +28,7 @@ | |||
28 | {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %} | 28 | {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %} |
29 | No builds found | 29 | No builds found |
30 | {%else%} | 30 | {%else%} |
31 | All builds | 31 | Project builds |
32 | {%endif%} | 32 | {%endif%} |
33 | <i class="icon-question-sign get-help heading-help" title="This page lists all the builds for the current project"></i> | 33 | <i class="icon-question-sign get-help heading-help" title="This page lists all the builds for the current project"></i> |
34 | </h1> | 34 | </h1> |
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | {% include "basetable_top.html" %} | 59 | {% include "basetable_top.html" %} |
60 | <!-- Table data rows; the order needs to match the order of "tablecols" definitions; and the <td class value needs to match the tablecols clclass value for show/hide buttons to work --> | 60 | <!-- Table data rows; the order needs to match the order of "tablecols" definitions; and the <td class value needs to match the tablecols clclass value for show/hide buttons to work --> |
61 | {% for br in objects %}{% if br.build %} {% with build=br.build %} {# if we have a build, just display it #} | 61 | {% for build in objects %} {# if we have a build, just display it #} |
62 | <tr class="data"> | 62 | <tr class="data"> |
63 | <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> | 63 | <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> |
64 | {% if build.project %} | 64 | {% if build.project %} |
@@ -96,40 +96,6 @@ | |||
96 | {% endif %} | 96 | {% endif %} |
97 | </td> | 97 | </td> |
98 | </tr> | 98 | </tr> |
99 | |||
100 | {%endwith%} | ||
101 | {% else %} {# we don't have a build for this build request, mask the data with build request data #} | ||
102 | |||
103 | |||
104 | |||
105 | <tr class="data"> | ||
106 | <td class="outcome">{% if br.state == br.REQ_FAILED %}<i class="icon-minus-sign error"></i>{%else%}FIXME_build_request_state{%endif%}</td> | ||
107 | <td class="target"> | ||
108 | <a href="{% url "builddashboard" br.id %}"><span data-toggle="tooltip" {%if br.brtarget_set.all.count > 1%}title="Targets: {%for target in br.brtarget_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{br.brtarget_set.all.0.target}} {%if br.brtarget_set.all.count > 1%}(+ {{br.brtarget_set.all.count|add:"-1"}}){%endif%} </span></a> | ||
109 | </td> | ||
110 | <td class="machine"> | ||
111 | <a href="{% url "builddashboard" br.id %}">{{br.machine}}</a> | ||
112 | </td> | ||
113 | <td class="started_on"> | ||
114 | <a href="{% url "builddashboard" br.id %}">{{br.created|date:"d/m/y H:i"}}</a> | ||
115 | </td> | ||
116 | <td class="completed_on"> | ||
117 | <a href="{% url "builddashboard" br.id %}">{{br.updated|date:"d/m/y H:i"}}</a> | ||
118 | </td> | ||
119 | <td class="failed_tasks error"> | ||
120 | </td> | ||
121 | <td class="errors.count"> | ||
122 | <a class="errors.count error" href="{% url "builddashboard" br.id %}#errors">{{br.brerror_set.all.count}} error{{br.brerror_set.all.count|pluralize}}</a> | ||
123 | </td> | ||
124 | <td class="warnings.count"> | ||
125 | </td> | ||
126 | <td class="time"> | ||
127 | {{br.timespent.total_seconds|sectohms}} | ||
128 | </td> | ||
129 | <td class="output"> {# we have no output here #} | ||
130 | </td> | ||
131 | </tr> | ||
132 | {%endif%} | ||
133 | {% endfor %} | 99 | {% endfor %} |
134 | 100 | ||
135 | 101 | ||