bootstrap4: correctly set colspan value in build table

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/src/templates/modules/build-table.html b/src/templates/modules/build-table.html
index 4df9988c65c02eb1da7b8a63ad1d4ce62a8dd099..418153efb56fa85246e7dcd67ef5eaa68b9e83a1 100644 (file)
--- a/src/templates/modules/build-table.html
+++ b/src/templates/modules/build-table.html
@@ -4,7 +4,7 @@
                        <tbody>
                                {% for date, builds in dates %}
                                        <tr>
-                                               <td colspan="4">
+                                               <td colspan="{{ colspan }}">
                                                        <h4>
                                                                {% module HeadingDate(date) %}
                                                                <small>({{ len(builds) }})</small>
@@ -23,6 +23,12 @@
                                                {% if show_when %}
                                                        <th>{{ _("Created") }}</th>
                                                {% end %}
+                                               {% if show_repo_time %}
+                                                       <th>{{ _("In repository since") }}</th>
+                                               {% end %}
+                                               {% if show_can_move_forward %}
+                                                       <th>{{ _("Can be moved forward") }}</th>
+                                               {% end %}
                                        </tr>
 
                                        {% for build in builds %}

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index 40498fa36fd9f895134fea00506cbf14fb2f8477..a95270c0adec1513ed8b5acb8c251c965d8153ac 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -205,6 +205,14 @@ class BuildTableModule(UIModule):
                )
                settings.update(kwargs)
 
+               colspan = 2
+
+               for key in settings.iterkeys():
+                       if settings.get(key) == True:
+                               colspan = colspan + 1
+
+               settings.setdefault("colspan", colspan)
+
                dates = {}
 
                for b in builds: