jobs: Fix rendering the queue

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/jobs/queue.html b/src/templates/jobs/queue.html
index 0ca8134b98a8a1ba6bdee8e18163d856cd343973..4d265bed874b603de9c227b2692d2aa5c6ba1b87 100644 (file)
--- a/src/templates/jobs/queue.html
+++ b/src/templates/jobs/queue.html
@@ -1,6 +1,8 @@
-{% extends "../base.html" %}
+{% extends "base.html" %}
 
-{% block title %}{{ _("Job Queue") }}{% end block %}
+{% from "jobs/macros.html" import JobQueue with context %}
+
+{% block title %}{{ _("Job Queue") }}{% endblock %}
 
 {% block body %}
        <section class="hero is-light">
@@ -11,6 +13,7 @@
                                                <li>
                                                        <a href="/jobs">{{ _("Jobs") }}</a>
                                                </li>
+
                                                <li class="is-active">
                                                        <a href="#" aria-current="page">
                                                                {{ _("Queue") }}
@@ -26,13 +29,7 @@
 
        <section class="section">
                <div class="container">
-                       {% if queue %}
-                               {% module JobsQueue(queue) %}
-                       {% else %}
-                               <div class="notification">
-                                       {{ _("There are currently no jobs queued") }}
-                               </div>
-                       {% end %}
+                       {{ JobQueue(queue) }}
                </div>
        </section>
-{% end block %}
+{% endblock %}

diff --git a/src/web/jobs.py b/src/web/jobs.py
index c851a25defda48ccf968ddb1fa2872b783853a43..d4ea530b0c8a0cab85fa06d8f25c2550d8e0c9f0 100644 (file)
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -158,8 +158,8 @@ class IndexHandler(base.BaseHandler):
 
 
 class QueueHandler(base.BaseHandler):
-       def get(self):
-               self.render("jobs/queue.html", queue=self.backend.jobs.queue)
+       async def get(self):
+               await self.render("jobs/queue.html", queue=self.backend.jobs.queue)
 
 
 class LogHandler(base.BaseHandler):