[PATCH] toaster: fix download URL for task logs

[PATCH] toaster: fix download URL for task logs

[Elliot Smith]

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 call to the tag on a single line.

[YOCTO #9837]

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bitbake/lib/toaster/toastergui/templates/task.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
index 86789bd..d77d188 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/bitbake/lib/toaster/toastergui/templates/task.html
@@ -25,8 +25,10 @@
 {%if task.task_executed %}
     {# executed tasks outcome #}
     {% if task.logfile %}
-            <a class="btn btn-default btn-lg" href="{% url 'build_artifact' build.id
-                "tasklogfile" task.pk %}">Download task log</a>
+            <a class="btn btn-default btn-lg"
+               href="{% url 'build_artifact' build.id 'tasklogfile' task.pk %}">
+              Download task log
+            </a>
     {% endif %}
         {# show stack trace for failed task #}
         {% if task.outcome == task.OUTCOME_FAILED and log_head %}
-- 
2.7.4

Re: [PATCH] toaster: fix download URL for task logs

[Barros Pena, Belen]

On 15/07/2016 16:00, "toaster-bounces@yoctoproject.org on behalf of Elliot
Smith" <toaster-bounces@yoctoproject.org on behalf of
elliot.smith@intel.com> wrote:

>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 call to the tag on a single line.
>
>[YOCTO #9837]

This seems to work for tasks with outcome "executed", but I still see the
404 error when I try to download the log for tasks with outcome "cached".

Thanks!

Belén

>
>Signed-off-by: Elliot Smith <elliot.smith@intel.com>
>---
> bitbake/lib/toaster/toastergui/templates/task.html | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/bitbake/lib/toaster/toastergui/templates/task.html
>b/bitbake/lib/toaster/toastergui/templates/task.html
>index 86789bd..d77d188 100644
>--- a/bitbake/lib/toaster/toastergui/templates/task.html
>+++ b/bitbake/lib/toaster/toastergui/templates/task.html
>@@ -25,8 +25,10 @@
> {%if task.task_executed %}
>     {# executed tasks outcome #}
>     {% if task.logfile %}
>-            <a class="btn btn-default btn-lg" href="{% url
>'build_artifact' build.id
>-                "tasklogfile" task.pk %}">Download task log</a>
>+            <a class="btn btn-default btn-lg"
>+               href="{% url 'build_artifact' build.id 'tasklogfile'
>task.pk %}">
>+              Download task log
>+            </a>
>     {% endif %}
>         {# show stack trace for failed task #}
>         {% if task.outcome == task.OUTCOME_FAILED and log_head %}
>-- 
>2.7.4
>
>-- 
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster

[PATCH] toaster: fix download URL for task logs

[Ed Bartosh]

From: Elliot Smith <elliot.smith@intel.com>

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]

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 bitbake/lib/toaster/toastergui/templates/task.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
index 86789bd..214c777 100644
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ b/bitbake/lib/toaster/toastergui/templates/task.html
@@ -25,8 +25,10 @@
 {%if task.task_executed %}
     {# executed tasks outcome #}
     {% if task.logfile %}
-            <a class="btn btn-default btn-lg" href="{% url 'build_artifact' build.id
-                "tasklogfile" task.pk %}">Download task log</a>
+            <a class="btn btn-default btn-lg"
+               href="{% url 'build_artifact' build.id 'tasklogfile' task.pk %}">
+              Download task log
+            </a>
     {% endif %}
         {# show stack trace for failed task #}
         {% if task.outcome == task.OUTCOME_FAILED and log_head %}
@@ -156,8 +158,10 @@ this prebuilt task is reusing"></span></a>
     {%elif task.outcome == task.OUTCOME_CACHED%}
             {% for t in task.get_related_setscene %}
                 {% if forloop.last %}
-                    <a class="btn btn-default btn-lg" href="{% url
-                        'build_artifact' build.id "tasklogfile" t.pk %}">Download task log</a>
+                    <a class="btn btn-default btn-lg"
+                       href="{% url 'build_artifact' build.id "tasklogfile" t.pk %}">
+                      Download task log
+                    </a>
                 {% endif %}
             {% endfor %}
 
-- 
2.6.6