From 5cac5389b06d74b3820379158f37863f69014826 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 17 Nov 2015 01:01:26 +0100
Subject: Metadata: Add fix for django1.7

The Metadata database backend also uses django1.7 and we have to run
django.setup() here, too.
---
 src/lib/Bcfg2/Server/Plugins/Metadata.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 657e4df31..30f60fffe 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -35,6 +35,7 @@ def load_django_models():
     # pylint: enable=W0602
 
     try:
+        import django
         from django.db import models
         HAS_DJANGO = True
     except ImportError:
@@ -99,6 +100,9 @@ def load_django_models():
             except MetadataClientModel.DoesNotExist:
                 return False
 
+    if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
+        django.setup()  # pylint: disable=E1101
+
 
 class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked):
     """Handles xml config files and all XInclude statements"""
-- 
cgit v1.2.3-1-g7c22


From 767fab36197a6eb1af4215b4d5d4c9a62a49bf11 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 17 Nov 2015 01:36:38 +0100
Subject: Reporting/templates: Fix django1.5 compat

This was missing in 84a83cab07853b83e91c40c440f65b911e3296a5.
---
 src/lib/Bcfg2/Reporting/templates/widgets/interaction_list.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Bcfg2/Reporting/templates/widgets/interaction_list.inc b/src/lib/Bcfg2/Reporting/templates/widgets/interaction_list.inc
index 444d05e1e..90c5152ba 100644
--- a/src/lib/Bcfg2/Reporting/templates/widgets/interaction_list.inc
+++ b/src/lib/Bcfg2/Reporting/templates/widgets/interaction_list.inc
@@ -15,7 +15,7 @@
   </tr>
   {% for entry in entry_list %}
   <tr class='{% cycle listview,listview_alt %}'>
-    <td class='left_column'><a href='{% url reports_client_detail_pk hostname=entry.client.name, pk=entry.id %}' class="white-space: nowrap;">
+    <td class='left_column'><a href='{% url "reports_client_detail_pk" hostname=entry.client.name pk=entry.id %}' class="white-space: nowrap;">
       {{ entry.timestamp|date:"SHORT_DATETIME_FORMAT"|safe }}
     </a></td>
     {% if not client %}
-- 
cgit v1.2.3-1-g7c22


From f4e52ab2980a5618f5121be360361ad45d438482 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 17 Nov 2015 01:38:58 +0100
Subject: Reporting/templates: Remove deprecated syntax

> Deprecated since version 1.8:
> You can also pass a dotted Python path to a view function, but this
> syntax is deprecated and will be removed in Django 1.10.
---
 src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
index cf778504a..130d58ede 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
@@ -25,7 +25,7 @@ This is needed for Django versions less than 1.5
   </tr>
   {% for entry in entry_list %}
   <tr class='{% cycle listview,listview_alt %}'>
-    <td class='left_column'><a href='{% url "Bcfg2.Reporting.views.client_detail" hostname=entry.client.name pk=entry.id %}'>{{ entry.client.name }}</a></td>
+    <td class='left_column'><a href='{% url "reports_client_detail_pk" hostname=entry.client.name pk=entry.id %}'>{{ entry.client.name }}</a></td>
     <td class='right_column' style='width:75px'><a href='{% add_url_filter state=entry.state %}'
       class='{{entry|determine_client_state}}'>{{ entry.state }}</a></td>
     <td class='right_column_narrow'>{{ entry.good_count }}</td>
-- 
cgit v1.2.3-1-g7c22