diff options
| author | Belen Barros Pena <belen.barros.pena@intel.com> | 2015-02-09 11:48:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-10 23:07:49 +0000 |
| commit | b2a903e1bae32889d5eef3af590489486e6acffc (patch) | |
| tree | 75c639a9b6a9f6472ecd24bca6d433d915c1919b /bitbake | |
| parent | 6877263f36a7ee16e3f3b895ab22206f7d976abc (diff) | |
| download | ast2050-yocto-poky-b2a903e1bae32889d5eef3af590489486e6acffc.zip ast2050-yocto-poky-b2a903e1bae32889d5eef3af590489486e6acffc.tar.gz | |
bitbake: toastergui: add download task log icon to recipe details page
When a task fails, we keep the log and allow users to
download it. Make sure the download is provided in the
tasks table of the recipe details page.
[YOCTO #7207]
(Bitbake rev: 29837409a6cbabafe9e4d102e8143bab5ec22dc2)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/libtoaster.js | 4 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/recipe.html | 11 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/tasks.html | 10 |
3 files changed, 13 insertions, 12 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js index 04264cd..2dc5b0a 100644 --- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js +++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js @@ -1,4 +1,3 @@ - /* All shared functionality to go in libtoaster object. * This object really just helps readability since we can then have * a traceable namespace. @@ -315,6 +314,9 @@ $(document).ready(function() { // initialise the tooltips for the icon-pencil icons $(".icon-pencil").tooltip({ container: 'body', html: true, delay: {show: 400}, title: "Change" }); + // initialise the tooltips for the download icons + $(".icon-download-alt").tooltip({ container: 'body', html: true, delay: { show: 200 } }); + // linking directly to tabs $(function(){ var hash = window.location.hash; diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html index d91768d..621b852 100644 --- a/bitbake/lib/toaster/toastergui/templates/recipe.html +++ b/bitbake/lib/toaster/toastergui/templates/recipe.html @@ -124,17 +124,16 @@ <td> <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}} </a> + {% if MANAGED and build.project and task.outcome = task.OUTCOME_FAILED %} + <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}"> + <i class="icon-download-alt" title="Download task log file"></i> + </a> + {% endif %} <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i> </td> <td> {% ifnotequal task.sstate_result task.SSTATE_NA %} <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_sstate_result_display}}</a> - {% if MANAGED and build.project and task.outcome = task.OUTCOME_FAILED %} - <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}"> - <i class="icon-download-alt" title="" data-original-title="Download task log file"></i> - </a> - {% endif %} - {% endifnotequal %} </td> diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index 4cbcc5e..5c1c476 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html @@ -93,12 +93,12 @@ </td> <td class="outcome"> <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}} </a> + {% if MANAGED and build.project and task.outcome = task.OUTCOME_FAILED %} + <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}"> + <i class="icon-download-alt" title="Download task log file"></i> + </a> + {% endif %} <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i> - {% if MANAGED and build.project and task.outcome = task.OUTCOME_FAILED %} - <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}"> - <i class="icon-download-alt" title="" data-original-title="Download task log file"></i> - </a> - {% endif %} </td> <td class="cache_attempt"> <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a> |
