From 483b6c8676f1b195f0b14ab54de732fbe0f5b684 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander.sulfrian@fu-berlin.de>
Date: Wed, 21 Mar 2018 17:58:08 +0100
Subject: Reporting: Fix syntax of "cycle" templatetag

The backwords compatible syntax was removed in 1.10. The "new" syntax is
available since 11 years [1] and was already available in django 1.0 [2].

> Support for the syntax of {% cycle %} that uses comma-separated
> arguments is removed. [3]

[1]: https://code.djangoproject.com/ticket/208
[2]: https://github.com/django/django/commit/09145d2e5f
[3]: https://docs.djangoproject.com/en/2.0/releases/1.10/#features-removed-in-1-10
---
 src/lib/Bcfg2/Reporting/templates/config_items/common.html       | 2 +-
 src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html | 2 +-
 src/lib/Bcfg2/Reporting/templates/config_items/listing.html      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/Bcfg2/Reporting/templates/config_items')

diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/common.html b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
index 1445182be..8c2df8db1 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/common.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
@@ -28,7 +28,7 @@
       <table id='table_{{ type_name }}' class='entry_list'>
       <tr style='text-align: left'><th>Type</th><th>Name</th><th>Count</th><th>Reason</th></tr>
       {% for item in type_list %}
-        <tr class='{% cycle listview,listview_alt %}'>
+        <tr class='{% cycle 'listview' 'listview_alt' %}'>
           <td>{{ item.ENTRY_TYPE }}</td>
           <td><a href='{% url "reports_entry" item.class_name  item.pk %}'>{{ item.name }}</a></td>
           <td>{{ item.num_entries }}</td>
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
index 160d9c738..4d9c42391 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
@@ -17,7 +17,7 @@
           <tr style='text-align: left' ><th>Name</th><th>Timestamp</th><th>State</th><th>Reason</th></tr>
         {% for item, inters in items %}
           {% for inter in inters %}
-          <tr class='{% cycle listview,listview_alt %}'>
+          <tr class='{% cycle 'listview' 'listview_alt' %}'>
             <td><a href='{% url "reports_client_detail" hostname=inter.client.name %}'>{{inter.client.name}}</a></td>
             <td><a href='{% url "reports_client_detail_pk" hostname=inter.client.name pk=inter.pk %}' style="white-space: nowrap;">
               {{inter.timestamp|date:"SHORT_DATETIME_FORMAT"|safe}}
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
index 1ae82dab5..b8fba61ce 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
@@ -21,7 +21,7 @@
       <table id='table_{{ type_name }}' class='entry_list'>
         <tr style='text-align: left' ><th>Name</th><th>Count</th><th>Reason</th></tr>
         {% for entry in type_data %}
-          <tr class='{% cycle listview,listview_alt %}'>
+          <tr class='{% cycle 'listview' 'listview_alt' %}'>
             <td><a href='{% url "reports_entry" entry.class_name entry.pk %}'>{{entry.name}}</a></td>
             <td>{{entry.num_entries}}</td>
             <td><a href='{% url "reports_item" entry.class_name entry.pk %}'>{{entry.short_list|join:","}}</a></td>
-- 
cgit v1.2.3-1-g7c22