Reports: Add support for Django 1.5

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

4 files changed, 19 insertions, 15 deletions

diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/common.html b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
index 57191ec39..0dbd52156 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/common.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
@@ -29,9 +29,9 @@
       {% for item in type_list %}
         <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><a href='{% url "reports_entry" item.class_name  item.pk %}'>{{ item.name }}</a></td>
           <td>{{ item.num_entries }}</td>
-          <td><a href="{% url reports_item item.ENTRY_TYPE, item.pk %}">{{ item.short_list|join:"," }}</a></td>
+          <td><a href='{% url "reports_item" item.ENTRY_TYPE  item.pk %}'>{{ item.short_list|join:"," }}</a></td>
         </tr>
       {% endfor %}
       </table>
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 e940889ab..e3befb0eb 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
@@ -1,5 +1,9 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
+{% comment %}
+This is needed for Django versions less than 1.5
+{% endcomment %}
+{% load url from future %}
 
 {% block title %}Bcfg2 - Entry Status{% endblock %}
 
@@ -17,10 +21,10 @@
         {% for item, inters in items %}
           {% for inter in inters %}
           <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 %}'>{{inter.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe}}</a></td>
+            <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 %}'>{{inter.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe}}</a></td>
             <td>{{ item.get_state_display }}</td>
-            <td style='white-space: nowrap'><a href="{% url reports_item entry_type=item.class_name pk=item.pk %}">({{item.pk}}) {{item.short_list|join:","}}</a></td>
+            <td style='white-space: nowrap'><a href='{% url "reports_item" entry_type=item.class_name pk=item.pk %}'>({{item.pk}}) {{item.short_list|join:","}}</a></td>
           </tr>
           {% endfor %}
         {% endfor %}
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/item.html b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
index 259414399..c15a85e0a 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/item.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
@@ -9,20 +9,20 @@
 {% block extra_header_info %}
 <style type="text/css">
 #table_list_header {
-	font-size: 100%;
+    font-size: 100%;
 }
 table.entry_list {
-        width: auto;
+    width: auto;
 }
 div.information_wrapper {
-	margin: 15px;
+    margin: 15px;
 }
 div.diff_wrapper {
-	overflow: auto;
+    overflow: auto;
 }
 div.entry_list h3 {
-	font-size: 90%;
-	padding: 5px;
+    font-size: 90%;
+    padding: 5px;
 }
 </style>
 {% endblock%}
@@ -131,9 +131,9 @@ div.entry_list h3 {
     {% if associated_list %}
       <table class="entry_list" cellpadding="3">
         {% for inter in associated_list %}
-          <tr><td><a href="{% url reports_client_detail inter.client.name %}"
+          <tr><td><a href='{% url "reports_client_detail" inter.client.name %}'
               >{{inter.client.name}}</a></td>
-          <td><a href="{% url reports_client_detail_pk hostname=inter.client.name,pk=inter.id %}"
+          <td><a href='{% url "reports_client_detail_pk" hostname=inter.client.name pk=inter.id %}'
               >{{inter.timestamp}}</a></td>
           </tr>
         {% endfor %}
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
index 864392754..fb10bb020 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
@@ -21,9 +21,9 @@
         <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 %}'>
-            <td><a href="{% url reports_entry entry.class_name entry.pk %}">{{entry.name}}</a></td>
+            <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>
+            <td><a href='{% url "reports_item" entry.class_name entry.pk %}'>{{entry.short_list|join:","}}</a></td>
           </tr>
         {% endfor %}
       </table>