diff options
| author | Belen Barros Pena <belen.barros.pena@intel.com> | 2015-11-10 17:08:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:55:08 +0000 |
| commit | 88f9310ce0015be539ffefbeff4b64c73779fdc9 (patch) | |
| tree | 758a2113061e6617b1c40ab99aad16816007a54f /bitbake/lib | |
| parent | d04af8b57114960df6fb52a7e75a72e4368dd945 (diff) | |
| download | poky-88f9310ce0015be539ffefbeff4b64c73779fdc9.tar.gz | |
bitbake: toaster: builds pages Fix the download cooker log link
The 'all builds' page was missing the download icon next to the outcome
icon, which allows you to download a build log from the 'all builds' page.
This patch brings it back. It also adds a check in the project builds page
to make sure the download icon only appears if the build generates a cooker
log, since builds that fail at the build request stage do not generate a
cooker log.
(Bitbake rev: 50d7ffa697764d84d96f26a3ae58a9dacde7b31e)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/builds.html | 8 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projectbuilds.html | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html b/bitbake/lib/toaster/toastergui/templates/builds.html index a27a121913..c3cc266daf 100644 --- a/bitbake/lib/toaster/toastergui/templates/builds.html +++ b/bitbake/lib/toaster/toastergui/templates/builds.html | |||
| @@ -62,7 +62,13 @@ | |||
| 62 | {% for build in objects %} | 62 | {% for build in objects %} |
| 63 | <tr class="data" data-table-build-result="{{ build.id }}"> | 63 | <tr class="data" data-table-build-result="{{ build.id }}"> |
| 64 | <td class="outcome"> | 64 | <td class="outcome"> |
| 65 | <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> | 65 | <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> |
| 66 | {% if build.cooker_log_path %} | ||
| 67 | | ||
| 68 | <a href="{% url 'build_artifact' build.id "cookerlog" build.id %}"> | ||
| 69 | <i class="icon-download-alt" title="Download build log"></i> | ||
| 70 | </a> | ||
| 71 | {% endif %} | ||
| 66 | </td> | 72 | </td> |
| 67 | <td class="target"> | 73 | <td class="target"> |
| 68 | {% for t in build.target_set.all %} | 74 | {% for t in build.target_set.all %} |
diff --git a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html index bb38284aab..3402fc4fe1 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html +++ b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html | |||
| @@ -63,11 +63,12 @@ | |||
| 63 | {% for build in objects %} {# if we have a build, just display it #} | 63 | {% for build in objects %} {# if we have a build, just display it #} |
| 64 | <tr class="data"> | 64 | <tr class="data"> |
| 65 | <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> | 65 | <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> |
| 66 | {% if build.project %} | 66 | {% if build.cooker_log_path %} |
| 67 | <a href="{% url 'build_artifact' build.id "cookerlog" build.id %}"> | 67 | |
| 68 | <i class="icon-download-alt" title="" data-original-title="Download build log"></i> | 68 | <a href="{% url 'build_artifact' build.id "cookerlog" build.id %}"> |
| 69 | </a> | 69 | <i class="icon-download-alt" title="Download build log"></i> |
| 70 | {% endif %} | 70 | </a> |
| 71 | {% endif %} | ||
| 71 | </td> | 72 | </td> |
| 72 | 73 | ||
| 73 | <td class="target"> | 74 | <td class="target"> |
