summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-02-09 11:48:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-10 23:07:49 +0000
commitb2a903e1bae32889d5eef3af590489486e6acffc (patch)
tree75c639a9b6a9f6472ecd24bca6d433d915c1919b /bitbake/lib
parent6877263f36a7ee16e3f3b895ab22206f7d976abc (diff)
downloadpoky-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/lib')
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/libtoaster.js4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipe.html11
-rw-r--r--bitbake/lib/toaster/toastergui/templates/tasks.html10
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 04264cd8ba..2dc5b0a0a1 100644
--- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
+++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
@@ -1,4 +1,3 @@
1
2/* All shared functionality to go in libtoaster object. 1/* All shared functionality to go in libtoaster object.
3 * This object really just helps readability since we can then have 2 * This object really just helps readability since we can then have
4 * a traceable namespace. 3 * a traceable namespace.
@@ -315,6 +314,9 @@ $(document).ready(function() {
315 // initialise the tooltips for the icon-pencil icons 314 // initialise the tooltips for the icon-pencil icons
316 $(".icon-pencil").tooltip({ container: 'body', html: true, delay: {show: 400}, title: "Change" }); 315 $(".icon-pencil").tooltip({ container: 'body', html: true, delay: {show: 400}, title: "Change" });
317 316
317 // initialise the tooltips for the download icons
318 $(".icon-download-alt").tooltip({ container: 'body', html: true, delay: { show: 200 } });
319
318 // linking directly to tabs 320 // linking directly to tabs
319 $(function(){ 321 $(function(){
320 var hash = window.location.hash; 322 var hash = window.location.hash;
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html
index d91768df3b..621b852e77 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe.html
@@ -124,17 +124,16 @@
124 124
125 <td> 125 <td>
126 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}} </a> 126 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}} </a>
127 {% if MANAGED and build.project and task.outcome = task.OUTCOME_FAILED %}
128 <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}">
129 <i class="icon-download-alt" title="Download task log file"></i>
130 </a>
131 {% endif %}
127 <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i> 132 <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i>
128 </td> 133 </td>
129 <td> 134 <td>
130 {% ifnotequal task.sstate_result task.SSTATE_NA %} 135 {% ifnotequal task.sstate_result task.SSTATE_NA %}
131 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_sstate_result_display}}</a> 136 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_sstate_result_display}}</a>
132 {% if MANAGED and build.project and task.outcome = task.OUTCOME_FAILED %}
133 <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}">
134 <i class="icon-download-alt" title="" data-original-title="Download task log file"></i>
135 </a>
136 {% endif %}
137
138 {% endifnotequal %} 137 {% endifnotequal %}
139 </td> 138 </td>
140 139
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
index 4cbcc5ed68..5c1c476bad 100644
--- a/bitbake/lib/toaster/toastergui/templates/tasks.html
+++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
@@ -93,12 +93,12 @@
93 </td> 93 </td>
94 <td class="outcome"> 94 <td class="outcome">
95 <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}} </a> 95 <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}} </a>
96 {% if MANAGED and build.project and task.outcome = task.OUTCOME_FAILED %}
97 <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}">
98 <i class="icon-download-alt" title="Download task log file"></i>
99 </a>
100 {% endif %}
96 <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i> 101 <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i>
97 {% if MANAGED and build.project and task.outcome = task.OUTCOME_FAILED %}
98 <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}">
99 <i class="icon-download-alt" title="" data-original-title="Download task log file"></i>
100 </a>
101 {% endif %}
102 </td> 102 </td>
103 <td class="cache_attempt"> 103 <td class="cache_attempt">
104 <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a> 104 <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a>