diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2016-07-17 14:19:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-17 14:19:44 +0200 |
| commit | a25d871158f49b9b5b86303058de24c763dc2590 (patch) | |
| tree | 5fb9fb841ead0262e88afa01798f8c9cba6044d3 /src | |
| parent | 6882df7d2f38cae19a0b68ac0278a8899ca4d3f5 (diff) | |
| parent | f4e52ab2980a5618f5121be360361ad45d438482 (diff) | |
| download | bcfg2-a25d871158f49b9b5b86303058de24c763dc2590.tar.gz bcfg2-a25d871158f49b9b5b86303058de24c763dc2590.tar.bz2 bcfg2-a25d871158f49b9b5b86303058de24c763dc2590.zip | |
Merge pull request #320 from AlexanderS/fix/more-django-fixes
Some more django fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Reporting/templates/widgets/interaction_list.inc | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 4 |
3 files changed, 6 insertions, 2 deletions
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> 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 %} 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""" |