]> git.ipfire.org Git - pbs.git/commitdiff
jobs: Use the same interface to check if failed
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Oct 2022 15:36:35 +0000 (15:36 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Oct 2022 15:36:35 +0000 (15:36 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/jobs.py
src/templates/builds/modules/list.html
src/templates/modules/jobs/list.html

index 12912ef37d9f9f586f490b22a2e255ef6dde229c..c73c4e7597177ed2edeba183d11864ea043d52db 100644 (file)
@@ -294,6 +294,13 @@ class Job(base.DataObject):
                """
                return self.data.failed
 
+       def has_failed(self):
+               """
+                       Returns True if this job has failed
+               """
+               if self.has_finished():
+                       return self.data.failed
+
        @property
        def message(self):
                return self.data.message
index 932f4cdcb23f4b0e65e84e3207ee6b599bf3992c..b2ebd7eedcfbd7d8a827d2a914a3c543bd0a3dc5 100644 (file)
@@ -14,7 +14,7 @@
                        <p>
                                {% for job in build.jobs %}
                                        <span class="label
-                                               {% if job.failed %}
+                                               {% if job.has_failed() %}
                                                        danger
                                                {% elif job.is_running() %}
                                                        primary
index 75b204d2a6156a4044c19d8dc34c8cbe5daabdbb..457ea9a0fd728db392f362349adbd7de0f327f8f 100644 (file)
@@ -10,7 +10,7 @@
                                        {% end %}
                                </h6>
 
-                               {% if job.failed %}
+                               {% if job.has_failed() %}
                                        <span class="alert label">{{ _("Failed") }}</span>
                                {% end %}