summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui/templates
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-07-21 18:42:35 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-26 08:10:36 +0100
commit83ccef335cf31395a8c6118a1631dc4d17894b76 (patch)
treeed39c7ba414a56930fbf359b6eddf315b3daed09 /bitbake/lib/toaster/toastergui/templates
parent24905d3c2de8dc31092a47dc15a09019751b53c1 (diff)
downloadpoky-83ccef335cf31395a8c6118a1631dc4d17894b76.tar.gz
bitbake: toaster: fix download URL for task logs
The task display template formatting had split the Django url template tag across two lines and broken it. This resulted in a gibberish URL for task logs. Fix by placing the tag and its arguments on a single line. [YOCTO #9837] (Bitbake rev: d6e88b7b410b6b99b47b031111a1126da9fd31b3) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/task.html12
1 files changed, 8 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
index 86789bd0b1..214c777831 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/bitbake/lib/toaster/toastergui/templates/task.html
@@ -25,8 +25,10 @@
25{%if task.task_executed %} 25{%if task.task_executed %}
26 {# executed tasks outcome #} 26 {# executed tasks outcome #}
27 {% if task.logfile %} 27 {% if task.logfile %}
28 <a class="btn btn-default btn-lg" href="{% url 'build_artifact' build.id 28 <a class="btn btn-default btn-lg"
29 "tasklogfile" task.pk %}">Download task log</a> 29 href="{% url 'build_artifact' build.id 'tasklogfile' task.pk %}">
30 Download task log
31 </a>
30 {% endif %} 32 {% endif %}
31 {# show stack trace for failed task #} 33 {# show stack trace for failed task #}
32 {% if task.outcome == task.OUTCOME_FAILED and log_head %} 34 {% if task.outcome == task.OUTCOME_FAILED and log_head %}
@@ -156,8 +158,10 @@ this prebuilt task is reusing"></span></a>
156 {%elif task.outcome == task.OUTCOME_CACHED%} 158 {%elif task.outcome == task.OUTCOME_CACHED%}
157 {% for t in task.get_related_setscene %} 159 {% for t in task.get_related_setscene %}
158 {% if forloop.last %} 160 {% if forloop.last %}
159 <a class="btn btn-default btn-lg" href="{% url 161 <a class="btn btn-default btn-lg"
160 'build_artifact' build.id "tasklogfile" t.pk %}">Download task log</a> 162 href="{% url 'build_artifact' build.id "tasklogfile" t.pk %}">
163 Download task log
164 </a>
161 {% endif %} 165 {% endif %}
162 {% endfor %} 166 {% endfor %}
163 167