diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-06-11 18:27:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-26 09:27:32 +0100 |
commit | d7c8d9558c8b600be1507212c78dde833b2bb57e (patch) | |
tree | 941c11d7e4aeca7f0c1106a39d1b8006264fbd16 /bitbake/lib/toaster/toastergui/templates/project.html | |
parent | 160563532f87bd901e1cc6972fe238be87a8b63c (diff) | |
download | poky-d7c8d9558c8b600be1507212c78dde833b2bb57e.tar.gz |
bitbake: toaster: fill in build data from buildrequest
This patch adds logic to complete changing the interface
from showing BuildRequests to showing Build data.
The BuildRequest data is now transformed in Build data with
proper Toaster exceptions being recorded instead of listing
problems during startup as build errors.
(Bitbake rev: 51a41172d0b390370f9a38696b1ac65666ada4d2)
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/project.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/project.html | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 0f6a77b63c..1a8991fda4 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html | |||
@@ -114,7 +114,7 @@ vim: expandtab tabstop=2 | |||
114 | 114 | ||
115 | <script type="text/ng-template" id="target_display"> | 115 | <script type="text/ng-template" id="target_display"> |
116 | <div data-ng-switch on="t.task.length"> | 116 | <div data-ng-switch on="t.task.length"> |
117 | <div data-ng-switch-when="0">{[t.target]}</div> | 117 | <div data-ng-switch-when="undefined">{[t.target]}</div> |
118 | <div data-ng-switch-default>{[t.target]}:{[t.task]}</div> | 118 | <div data-ng-switch-default>{[t.target]}:{[t.task]}</div> |
119 | </div> | 119 | </div> |
120 | </script> | 120 | </script> |
@@ -145,13 +145,13 @@ vim: expandtab tabstop=2 | |||
145 | 145 | ||
146 | <a id="buildslist"></a> | 146 | <a id="buildslist"></a> |
147 | <h2 class="air" data-ng-if="builds.length">Latest builds</h2> | 147 | <h2 class="air" data-ng-if="builds.length">Latest builds</h2> |
148 | <div class="animate-repeat alert" data-ng-repeat="b in builds track by b.id" data-ng-class="{'In Progress':'alert-info', 'Succeeded':'alert-success', 'Failed':'alert-error'}[b.status]"> | 148 | <div class="animate-repeat alert" data-ng-repeat="b in builds track by b.id" data-ng-class="{'Queued':'alert-info', 'In Progress':'alert-info', 'Succeeded':'alert-success', 'Failed':'alert-error'}[b.status]"> |
149 | <div class="row-fluid"> | 149 | <div class="row-fluid"> |
150 | <switch data-ng-switch="b.status"> | 150 | <switch data-ng-switch="b.status"> |
151 | 151 | ||
152 | <case data-ng-switch-when="Failed"> | 152 | <case data-ng-switch-when="Failed"> |
153 | <div class="lead span3"> | 153 | <div class="lead span3"> |
154 | <a data-ng-class="{'succeeded': 'success', 'failed': 'error'}[b.status]" href="{[b.br_page_url]}"> | 154 | <a data-ng-class="{'Succeeded': 'success', 'Failed': 'error'}[b.status]" href="{[b.br_page_url]}"> |
155 | <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> | 155 | <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> |
156 | </a> | 156 | </a> |
157 | </div> | 157 | </div> |
@@ -176,12 +176,19 @@ vim: expandtab tabstop=2 | |||
176 | <!-- we don't have warnings in this case --> | 176 | <!-- we don't have warnings in this case --> |
177 | </div> | 177 | </div> |
178 | <div> <span class="lead">Build time: {[b.command_time|timediff]}</span> | 178 | <div> <span class="lead">Build time: {[b.command_time|timediff]}</span> |
179 | <button class="btn pull-right" data-ng-class="{'succeeded': 'btn-success', 'failed': 'btn-danger'}[b.status]" | 179 | <button class="btn pull-right" data-ng-class="{'Succeeded': 'btn-success', 'Failed': 'btn-danger'}[b.status]" |
180 | data-ng-click="buildExistingTarget(b.targets)">Run again</button> | 180 | data-ng-click="buildExistingTarget(b.targets)">Run again</button> |
181 | 181 | ||
182 | </div> | 182 | </div> |
183 | </case> | 183 | </case> |
184 | 184 | ||
185 | <case data-ng-switch-when="Queued"> | ||
186 | <div class="lead span5"> <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> </div> | ||
187 | <div class="span4 lead" >Build queued | ||
188 | <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> | ||
189 | </div> | ||
190 | <button class="btn pull-right btn-info" data-ng-click="buildCancel(b)">Cancel</button> | ||
191 | </case> | ||
185 | 192 | ||
186 | <case data-ng-switch-when="In Progress"> | 193 | <case data-ng-switch-when="In Progress"> |
187 | <switch data-ng-switch="b.build.length"> | 194 | <switch data-ng-switch="b.build.length"> |