jobs: Fetch all queue jobs before rendering the page

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

diff --git a/src/templates/jobs/queue.html b/src/templates/jobs/queue.html
index ce63091efdde9d214684e79a0c84488b94b3c9bd..44b9407657b7df43496a401b989ec9fc9ad02957 100644 (file)
--- a/src/templates/jobs/queue.html
+++ b/src/templates/jobs/queue.html
@@ -29,7 +29,7 @@
 
        <section class="section">
                <div class="container">
-                       {{ JobList(queue) }}
+                       {{ JobList(jobs) }}
                </div>
        </section>
 {% endblock %}

diff --git a/src/web/jobs.py b/src/web/jobs.py
index 14777c873d1d1f64d00e263197809f67e819f8cb..b648ff2aba8cea2180fe2353556d1a94cb818634 100644 (file)
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -142,7 +142,10 @@ class IndexHandler(base.BaseHandler):
 
 class QueueHandler(base.BaseHandler):
        async def get(self):
-               await self.render("jobs/queue.html", queue=self.backend.jobs.queue)
+               # Fetch all jobs
+               jobs = [job async for job in self.backend.jobs.queue]
+
+               await self.render("jobs/queue.html", jobs=jobs)
 
 
 class LogHandler(base.BaseHandler):