jobs: List recently finished jobs

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

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index aadb8ca66012b13b13003b928477139114e81d44..766f23eac34eeca3273f7019005cf56fc701b578 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -128,12 +128,11 @@ class Jobs(base.Object):
                """
                        Returns a list of all finished jobs
                """
+               # This will include deleted jobs
                stmt = (
                        sqlalchemy
                        .select(Job)
                        .where(
-                               Job.deleted_at == None,
-
                                # Get finished jobs only
                                Job.finished_at != None,
                        )

diff --git a/src/templates/jobs/macros.html b/src/templates/jobs/macros.html
index bbeb1c8cecc741055606d7d8a651e9d25e7a0d75..341e74c23ba53cbe81213211b08647e3f4d378f1 100644 (file)
--- a/src/templates/jobs/macros.html
+++ b/src/templates/jobs/macros.html
@@ -66,6 +66,14 @@
                                                                <h6 class="title is-6">
                                                                        {% if show_arch_only %}
                                                                                {{ job.arch }}
+                                                                       {% elif job.is_deleted() %}
+                                                                               <span class="icon-text">
+                                                                                       <span>{{ job }}</span>
+
+                                                                                       <span class="icon has-text-grey" title="{{ _("Deleted") }}">
+                                                                                               <i class="fa-solid fa-trash"></i>
+                                                                                       </span>
+                                                                               </span>
                                                                        {% else %}
                                                                                <a href="/builds/{{ job.build.uuid }}">
                                                                                        {{ job }}