From 529c186ee83b1f8cc4760a40868e50eb5993f8a4 Mon Sep 17 00:00:00 2001 From: Alexander Schier Date: Sat, 24 Oct 2015 20:06:56 +0200 Subject: [PATCH] compatibility with django 1.8 --- configstore/admin.py | 2 -- configstore/models.py | 1 + configstore/serializer.py | 2 +- requirements.txt | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configstore/admin.py b/configstore/admin.py index bbe2f90..f49703e 100644 --- a/configstore/admin.py +++ b/configstore/admin.py @@ -46,7 +46,6 @@ def add_view(self, request, form_url='', extra_context=None): model = self.model opts = model._meta app_label = opts.app_label - ordered_objects = opts.get_ordered_objects() obj = None configs = CONFIGS.items() def sort_by_label(a, b): @@ -70,7 +69,6 @@ def sort_by_label(a, b): 'has_delete_permission': self.has_delete_permission(request, obj), 'has_file_field': False, # FIXME - this should check if form or formsets have a FileField, 'has_absolute_url': hasattr(self.model, 'get_absolute_url'), - 'ordered_objects': ordered_objects, 'form_url': mark_safe(form_url), 'opts': opts, 'content_type_id': ContentType.objects.get_for_model(self.model).id, diff --git a/configstore/models.py b/configstore/models.py index 5f5b8c1..33e158d 100644 --- a/configstore/models.py +++ b/configstore/models.py @@ -19,3 +19,4 @@ def __unicode__(self): class Meta: unique_together = [('key', 'site')] + app_label = 'configstore' diff --git a/configstore/serializer.py b/configstore/serializer.py index 2d80a6f..8715191 100644 --- a/configstore/serializer.py +++ b/configstore/serializer.py @@ -6,7 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.db.models.query import QuerySet from django.db import models -from django.utils import simplejson +import simplejson from decimal import Decimal diff --git a/requirements.txt b/requirements.txt index feded18..cf9aca7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ pycrypto==2.6 +simplejson