Merge branch 'master' of git://git.ipfire.org/pbs

[people/jschlag/pbs.git] / src / templates / jobs-detail.html

diff --git a/src/templates/jobs-detail.html b/src/templates/jobs-detail.html
index 3402c6ce4410b13938d2e1da404739149b79e3da..9d605d5d1cfd5e181eb446721924e7928ba21bcb 100644 (file)
--- a/src/templates/jobs-detail.html
+++ b/src/templates/jobs-detail.html
@@ -135,12 +135,6 @@
                                                                        {{ format_date(job.time_finished, full_format=True) }}
                                                                </p>
                                                        {% end %}
-                                                       {% if job.is_running() %}
-                                                               <p>
-                                                                       <strong>{{ _("ETA") }}</strong><br>
-                                                                       {{ format_eta(job.eta) }}
-                                                               </p>
-                                                       {% end %}
                                        </div>
                                </div>
                        </div>
@@ -154,11 +148,11 @@
                                <p class="muted">{{ _("No logs available, yet.") }}</p>
                        {% end %}
 
-                       {% if job.has_buildroot() %}
+                       {% if job.buildroot %}
                                <hr>
                                <p class="ac">
-                                       <a href="/job/{{ job.uuid }}/buildroot?tries={{ job.tries }}">{{ _("Buildroot") }}</a>
-                                       ({{ _("%s package", "%s packages", job.has_buildroot()) % job.has_buildroot() }})
+                                       <a href="/job/{{ job.uuid }}/buildroot">{{ _("Buildroot") }}</a>
+                                       ({{ _("%s package", "%s packages", len(job.buildroot)) % len(job.buildroot) }})
                                </p>
                        {% end %}
                </div>