switch to django-tables2

Author: furlongm

errata/tables.py

@@ -0,0 +1,21 @@
+import django_tables2 as tables
+
+from errata.models import Erratum
+
+
+class ErratumTable(tables.Table):
+    name = tables.TemplateColumn('<a href="{{ record.get_absolute_url }}">{{ record.name }}</a>', order_by='name', verbose_name='ID', attrs={'th': {'class': 'col-sm-2'}, 'td': {'class': 'col-sm-2'}})
+    e_type = tables.Column(order_by='e_type', verbose_name='Type', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    issue_date = tables.DateColumn(order_by='issue_date', verbose_name='Published Date', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    synopsis = tables.Column(orderable=False, verbose_name='Synopsis', attrs={'th': {'class': 'col-sm-4'}, 'td': {'class': 'col-sm-4'}})
+    packages_affected = tables.TemplateColumn('{% with count=record.affected_packages.count %}{% if count != 0 %}<a href="{% url \'packages:package_list\' %}?erratum_id={{ record.id }}&type=affected">{{ count }}</a>{% else %}{% endif %}{% endwith %}', orderable=False, verbose_name='Packages Affected', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    packages_fixed = tables.TemplateColumn('{% with count=record.fixed_packages.count %}{% if count != 0 %}<a href="{% url \'packages:package_list\' %}?erratum_id={{ record.id }}&type=fixed">{{ count }}</a>{% else %}{% endif %}{% endwith %}', orderable=False, verbose_name='Packages Fixed', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    osreleases = tables.TemplateColumn('{% with count=record.osreleases.count %}{% if count != 0 %}<a href="{% url \'operatingsystems:osrelease_list\' %}?erratum_id={{ record.id }}">{{ count }}</a>{% else %}{% endif %}{% endwith %}', orderable=False, verbose_name='OS Releases Affected', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    cves = tables.TemplateColumn('{% with count=record.cves.count %}{% if count != 0 %}<a href="{% url \'security:cve_list\' %}?erratum_id={{ record.id }}">{{ count }}</a>{% else %}{% endif %}{% endwith %}', orderable=False, verbose_name='CVEs', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    references = tables.TemplateColumn('{% with count=record.references.count %}{% if count != 0 %}<a href="{% url \'security:reference_list\' %}?erratum_id={{ record.id }}">{{ count }}</a>{% else %}{% endif %}{% endwith %}', orderable=False, verbose_name='References', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+
+    class Meta:
+        model = Erratum
+        template_name = 'django_tables2/bootstrap.html'
+        attrs = {"class": "table table-striped table-bordered table-hover table-condensed table-responsive"}
+        fields = ('name', 'e_type', 'issue_date', 'synopsis', 'packages_affected', 'packages_fixed', 'osreleases', 'cves', 'references')

errata/templates/errata/erratum_table.html

@@ -1,31 +1,3 @@
 {% load common %}
-<table class="table table-striped table-bordered table-hover table-condensed table-responsive">
-  <thead>
-    <tr>
-      <th class="col-sm-2">ID</th>
-      <th class="col-sm-1">Type</th>
-      <th class="col-sm-1">Published Date</th>
-      <th class="col-sm-4">Synopsis</th>
-      <th class="col-sm-1">Packages Affected</th>
-      <th class="col-sm-1">Packages Fixed</th>
-      <th class="col-sm-1">OS Releases Affected</th>
-      <th class="col-sm-1">CVEs</th>
-      <th class="col-sm-1">References</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for erratum in object_list %}
-      <tr>
-        <td><a href="{{ erratum.get_absolute_url }}">{{ erratum.name }}</a></td>
-        <td>{{ erratum.e_type }}</td>
-        <td>{{ erratum.issue_date|date|default_if_none:'' }}</td>
-        <td>{{ erratum.synopsis }}</td>
-        <td>{% with count=erratum.affected_packages.count %}{% if count != 0 %}<a href="{% url 'packages:package_list' %}?erratum_id={{ erratum.id }}&type=affected">{{ count }}</a>{% else %}&nbsp;{% endif %}{% endwith %}</td>
-        <td>{% with count=erratum.fixed_packages.count %}{% if count != 0 %}<a href="{% url 'packages:package_list' %}?erratum_id={{ erratum.id }}&type=fixed">{{ count }}</a>{% else %}&nbsp;{% endif %}{% endwith %}</td>
-        <td>{% with count=erratum.osreleases.count %}{% if count != 0 %}<a href="{% url 'operatingsystems:osrelease_list' %}?erratum_id={{ erratum.id }}">{{ count }}</a>{% else %}&nbsp;{% endif %}{% endwith %}</td>
-        <td>{% with count=erratum.cves.count %}{% if count != 0 %}<a href="{% url 'security:cve_list' %}?erratum_id={{ erratum.id }}">{{ count }}</a>{% else %}&nbsp;{% endif %}{% endwith %}</td>
-        <td>{% with count=erratum.references.count %}{% if count != 0 %}<a href="{% url 'security:reference_list' %}?erratum_id={{ erratum.id }}">{{ count }}</a>{% else %}&nbsp;{% endif %}{% endwith %}</td>
-      </tr>
-    {% endfor %}
-  </tbody>
-</table>
+{% load django_tables2 %}
+{% render_table table %}

hosts/tables.py

@@ -0,0 +1,20 @@
+import django_tables2 as tables
+
+from hosts.models import Host
+
+
+class HostTable(tables.Table):
+    hostname = tables.TemplateColumn('<a href="{{ record.get_absolute_url }}">{{ record.hostname }}</a>', order_by='hostname', verbose_name='Hostname', attrs={'th': {'class': 'col-sm-3'}, 'td': {'class': 'col-sm-3'}})
+    sec_updates = tables.TemplateColumn('{% with count=record.get_num_security_updates %}{% if count != 0 %}<span style="color:red">{{ count }}</span>{% else %}{% endif %}{% endwith %}', orderable=False, verbose_name='Security Updates', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1 centered'}})
+    bug_updates = tables.TemplateColumn('{% with count=record.get_num_bugfix_updates %}{% if count != 0 %}<span style="color:orange">{{ count }}</span>{% else %}{% endif %}{% endwith %}', orderable=False, verbose_name='Bugfix Updates', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1 centered'}})
+    affected_errata = tables.TemplateColumn('{% with count=record.errata.count %}{% if count != 0 %}<a href="{% url \'errata:erratum_list\' %}?host={{ record.hostname }}">{{ count }}</a>{% else %}{% endif %}{% endwith %}', orderable=False, verbose_name='Affected by Errata', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1 centered'}})
+    kernel = tables.Column(verbose_name='Running Kernel', attrs={'th': {'class': 'col-sm-2'}, 'td': {'class': 'col-sm-2'}})
+    osvariant = tables.TemplateColumn('{% if record.osvariant %}<a href="{{ record.osvariant.get_absolute_url }}">{{ record.osvariant }}</a>{% endif %}', order_by='osvariant__name', verbose_name='OS Variant', attrs={'th': {'class': 'col-sm-2'}, 'td': {'class': 'col-sm-2'}})
+    lastreport = tables.Column(order_by='lastreport', verbose_name='Last Report', attrs={'th': {'class': 'col-sm-2'}, 'td': {'class': 'col-sm-2'}})
+    reboot_required = tables.TemplateColumn('{% load common %}{% no_yes_img record.reboot_required %}', orderable=False, verbose_name='Reboot Status', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1 centered'}})
+
+    class Meta:
+        model = Host
+        template_name = 'django_tables2/bootstrap.html'
+        attrs = {"class": "table table-striped table-bordered table-hover table-condensed table-responsive"}
+        fields = ('hostname', 'sec_updates', 'bug_updates', 'affected_errata', 'kernel', 'osvariant', 'lastreport', 'reboot_required')

hosts/templates/hosts/host_table.html

@@ -1,28 +1,3 @@
 {% load common report_alert %}
-<table class="table table-striped table-bordered table-hover table-condensed table-responsive">
-  <thead>
-    <tr>
-      <th class="col-sm-3">Hostname</th>
-      <th class="col-sm-1" colspan="2">Updates</th>
-      <th class="col-sm-1">Affected by Errata</th>
-      <th class="col-sm-2">Running Kernel</th>
-      <th class="col-sm-2">OS Variant</th>
-      <th class="col-sm-2">Last Report</th>
-      <th class="col-sm-1">Reboot Status</th>
-    </tr>
-  </thead>
-  <tbody>
-  {% for host in object_list %}
-    <tr>
-      <td><a href="{{ host.get_absolute_url }}">{{ host }}</a></td>
-      <td class="centered" style="color:red">{% with count=host.get_num_security_updates %}{% if count != 0 %}{{ count }}{% else %}&nbsp;{% endif %}{% endwith %}</td>
-      <td class="centered" style="color:orange">{% with count=host.get_num_bugfix_updates %}{% if count != 0 %}{{ count }}{% else %}&nbsp;{% endif %}{% endwith %}</td>
-      <td class="centered">{% with count=host.errata.count %}{% if count != 0 %}<a href="{% url 'errata:erratum_list' %}?host={{ host.hostname }}">{{ count }}{% else %}&nbsp;{% endif %}{% endwith %}<a/></td>
-      <td>{{ host.kernel }}</td>
-      <td><a href="{{ host.osvariant.get_absolute_url }}">{{ host.osvariant }}</a></td>
-      <td>{{ host.lastreport }}{% report_alert host.lastreport %}</td>
-      <td class="centered">{% no_yes_img host.reboot_required %}</td>
-    </tr>
-  {% endfor %}
-  </tbody>
-</table>
+{% load django_tables2 %}
+{% render_table table %}

modules/tables.py

@@ -0,0 +1,19 @@
+import django_tables2 as tables
+
+from modules.models import Module
+
+
+class ModuleTable(tables.Table):
+    name = tables.TemplateColumn('<a href="{{ record.get_absolute_url }}">{{ record.name }}</a>', order_by='name', verbose_name='Name', attrs={'th': {'class': 'col-sm-auto'}, 'td': {'class': 'col-sm-auto'}})
+    stream = tables.Column(verbose_name='Stream', attrs={'th': {'class': 'col-sm-auto'}, 'td': {'class': 'col-sm-auto'}})
+    version = tables.Column(verbose_name='Version', attrs={'th': {'class': 'col-sm-auto'}, 'td': {'class': 'col-sm-auto'}})
+    context = tables.Column(verbose_name='Context', attrs={'th': {'class': 'col-sm-auto'}, 'td': {'class': 'col-sm-auto'}})
+    repo = tables.TemplateColumn('<a href="{{ record.repo.get_absolute_url }}">{{ record.repo }}</a>', verbose_name='Repo', orderable=False, attrs={'th': {'class': 'col-sm-auto'}, 'td': {'class': 'col-sm-auto'}})
+    packages = tables.TemplateColumn('<a href="{% url \'packages:package_list\' %}?module_id={{ record.id }}">{{ record.packages.count }}</a>', verbose_name='Packages', orderable=False, attrs={'th': {'class': 'col-sm-auto'}, 'td': {'class': 'col-sm-auto'}})
+    enabled_on_hosts = tables.TemplateColumn('{{ record.host_set.count }}', verbose_name='Enabled on Hosts', orderable=False, attrs={'th': {'class': 'col-md-auto'}, 'td': {'class': 'col-md-auto'}})
+
+    class Meta:
+        model = Module
+        template_name = 'django_tables2/bootstrap.html'
+        attrs = {"class": "table table-striped table-bordered table-hover table-condensed table-responsive"}
+        fields = ('name', 'stream', 'version', 'context', 'repo', 'packages', 'enabled_on_hosts')

modules/templates/modules/module_table.html

@@ -1,27 +1,3 @@
 {% load common %}
-<table class="table table-striped table-bordered table-hover table-condensed table-responsive">
-  <thead>
-    <tr>
-      <th class="col-sm-auto">Name</th>
-      <th class="col-sm-auto">Stream</th>
-      <th class="col-sm-auto">Version</th>
-      <th class="col-sm-auto">Context</th>
-      <th class="col-sm-auto">Repo</th>
-      <th class="col-sm-auto">Packages</th>
-      <th class="col-md-auto">Enabled on Hosts</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for module in object_list %}
-      <tr>
-        <td><a href="{{ module.get_absolute_url }}">{{ module.name }}</a></td>
-        <td>{{ module.stream }}</td>
-        <td>{{ module.version }}</td>
-        <td>{{ module.context }}</td>
-        <td><a href="{{ module.repo.get_absolute_url }}">{{ module.repo }}</a></td>
-        <td><a href="{% url 'packages:package_list' %}?module_id={{ module.id }}">{{ module.packages.count }}</a></td>
-        <td>{{ module.host_set.count }}</td>
-      </tr>
-    {% endfor %}
-  </tbody>
-</table>
+{% load django_tables2 %}
+{% render_table table %}

operatingsystems/tables.py

@@ -0,0 +1,34 @@
+import django_tables2 as tables
+
+from operatingsystems.models import OSRelease, OSVariant
+
+
+class OSReleaseTable(tables.Table):
+    name = tables.TemplateColumn('<a href="{{ record.get_absolute_url }}">{{ record.name }}</a>', order_by='name', verbose_name='OS Release', attrs={'th': {'class': 'col-sm-3'}, 'td': {'class': 'col-sm-3'}})
+    cpe_name = tables.Column(verbose_name='CPE Name', attrs={'th': {'class': 'col-sm-2'}, 'td': {'class': 'col-sm-2'}})
+    codename = tables.Column(verbose_name='Codename', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    repos = tables.TemplateColumn('<a href="{% url \'repos:repo_list\' %}?osrelease_id={{ record.id }}">{{ record.repos.count }}</a>', verbose_name='Repos', orderable=False, attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    osvariants = tables.TemplateColumn('<a href="{% url \'operatingsystems:osvariant_list\' %}?osrelease_id={{ record.id }}">{{ record.osvariant_set.count }}</a>', verbose_name='OS Variants', orderable=False, attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    hosts = tables.TemplateColumn('{% load common %}<a href="{% url \'hosts:host_list\' %}?osrelease_id={{ record.id }}">{% host_count record %}</a>', verbose_name='Hosts', orderable=False, attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    errata = tables.TemplateColumn('<a href="{% url \'errata:erratum_list\' %}?osrelease_id={{ record.id }}">{{ record.erratum_set.count }}</a>', verbose_name='Errata', orderable=False, attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+
+    class Meta:
+        model = OSRelease
+        template_name = 'django_tables2/bootstrap.html'
+        attrs = {"class": "table table-striped table-bordered table-hover table-condensed table-responsive"}
+        fields = ('name', 'cpe_name', 'codename', 'repos', 'osvariants', 'hosts', 'errata')
+
+
+class OSVariantTable(tables.Table):
+    name = tables.TemplateColumn('<a href="{{ record.get_absolute_url }}">{{ record }}</a>', order_by='name', verbose_name='Name', attrs={'th': {'class': 'col-sm-4'}, 'td': {'class': 'col-sm-4'}})
+    arch = tables.Column(accessor='arch__name', verbose_name='Architecture', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    codename = tables.TemplateColumn('{% if record.codename %}{{ record.codename }}{% else %}{% if record.osrelease %}{{ record.osrelease.codename }}{% endif %}{% endif %}', order_by='codename', verbose_name='Codename', attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    hosts = tables.TemplateColumn('<a href="{% url \'hosts:host_list\' %}?osvariant_id={{ record.id }}">{{ record.host_set.count }}</a>', verbose_name='Hosts', orderable=False, attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+    osrelease = tables.TemplateColumn('{% if record.osrelease %}<a href="{{ record.osrelease.get_absolute_url }}">{{ record.osrelease }}</a>{% endif %}', order_by='osrelease__name', verbose_name='OS Release', attrs={'th': {'class': 'col-sm-4'}, 'td': {'class': 'col-sm-4'}})
+    repos_osrelease = tables.TemplateColumn('{% if record.osrelease.repos.count != None %}{{ record.osrelease.repos.count }}{% else %}0{% endif %}', verbose_name='Repos (OS Release)', orderable=False, attrs={'th': {'class': 'col-sm-1'}, 'td': {'class': 'col-sm-1'}})
+
+    class Meta:
+        model = OSVariant
+        template_name = 'django_tables2/bootstrap.html'
+        attrs = {"class": "table table-striped table-bordered table-hover table-condensed table-responsive"}
+        fields = ('name', 'arch', 'codename', 'hosts', 'osrelease', 'repos_osrelease')

operatingsystems/templates/operatingsystems/operatingsystemrelease_table.html

@@ -1,27 +1,3 @@
 {% load common %}
-<table class="table table-striped table-bordered table-hover table-condensed table-responsive">
-  <thead>
-    <tr>
-      <th class="col-sm-3">OS Release</th>
-      <th class="col-sm-2">CPE Name</th>
-      <th class="col-sm-1">Codename</th>
-      <th class="col-sm-1">Repos</th>
-      <th class="col-sm-1">OS Variants</th>
-      <th class="col-sm-1">Hosts</th>
-      <th class="col-sm-1">Errata</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for osrelease in object_list %}
-      <tr>
-        <td><a href="{{ osrelease.get_absolute_url }}">{{ osrelease.name }}</a></td>
-        <td>{% if osrelease.cpe_name %}{{ osrelease.cpe_name }}{% endif %}</td>
-        <td>{% if osrelease.codename %}{{ osrelease.codename }}{% endif %}</td>
-        <td><a href="{% url 'repos:repo_list' %}?osrelease_id={{ osrelease.id }}">{{ osrelease.repos.count }}</a></td>
-        <td><a href="{% url 'operatingsystems:osvariant_list' %}?osrelease_id={{ osrelease.id }}">{{ osrelease.osvariant_set.count }}</a></td>
-        <td><a href="{% url 'hosts:host_list' %}?osrelease_id={{ osrelease.id }}">{% host_count osrelease %}</a></td>
-        <td><a href="{% url 'errata:erratum_list' %}?osrelease_id={{ osrelease.id }}">{{ osrelease.erratum_set.count }}</a></td>
-      </tr>
-    {% endfor %}
-  </tbody>
-</table>
+{% load django_tables2 %}
+{% render_table table %}

operatingsystems/templates/operatingsystems/operatingsystemvariant_table.html

@@ -1,25 +1,3 @@
 {% load common %}
-<table class="table table-striped table-bordered table-hover table-condensed table-responsive">
-  <thead>
-    <tr>
-      <th class="col-sm-4">Name</th>
-      <th class="col-sm-1">Architecture</th>
-      <th class="col-sm-1">Codename</th>
-      <th class="col-sm-1">Hosts</th>
-      <th class="col-sm-4">OS Release</th>
-      <th class="col-sm-1">Repos (OS Release)</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for osvariant in object_list %}
-      <tr>
-        <td><a href="{{ osvariant.get_absolute_url }}">{{ osvariant }}</a></td>
-        <td>{{ osvariant.arch }}</td>
-        <td>{% if osvariant.codename %}{{ osvariant.codename }}{% else %}{% if osvariant.osrelease %}{{ osvariant.osrelease.codename }}{% endif %}{% endif %}</td>
-        <td><a href="{% url 'hosts:host_list' %}?osvariant_id={{ osvariant.id }}">{{ osvariant.host_set.count }}</a></td>
-        <td>{% if osvariant.osrelease %}<a href="{{ osvariant.osrelease.get_absolute_url }}">{{ osvariant.osrelease }}</a>{% endif %}</td>
-        <td>{% if osvariant.osrelease.repos.count != None %}{{ osvariant.osrelease.repos.count }}{% else %}0{% endif %}</td>
-      </tr>
-    {% endfor %}
-  </tbody>
-</table>
+{% load django_tables2 %}
+{% render_table table %}