From 96648df458c398a756a91ca9d92f17f523c33abf Mon Sep 17 00:00:00 2001 From: Sergey Dobrov Date: Wed, 5 Mar 2014 16:57:44 +0200 Subject: [PATCH 1/4] use update_wrapper from builtin functools module to be compatible with django 1.6 --- singleton_models/admin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/singleton_models/admin.py b/singleton_models/admin.py index 461c41b..551c1c7 100644 --- a/singleton_models/admin.py +++ b/singleton_models/admin.py @@ -1,8 +1,9 @@ +from functools import update_wrapper + from django.contrib import admin from django.utils.translation import ugettext as _ from django.utils.encoding import force_unicode from django.http import HttpResponseRedirect -from django.utils.functional import update_wrapper class SingletonModelAdmin(admin.ModelAdmin): From 3bd8820e94b3693800b2c18b5f44e37d3178b0e7 Mon Sep 17 00:00:00 2001 From: Sergey Dobrov Date: Wed, 5 Mar 2014 17:04:27 +0200 Subject: [PATCH 2/4] Django 1.6 has no urls.default module --- singleton_models/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/singleton_models/admin.py b/singleton_models/admin.py index 551c1c7..27a7bfa 100644 --- a/singleton_models/admin.py +++ b/singleton_models/admin.py @@ -14,7 +14,7 @@ def has_add_permission(self, request): return False def get_urls(self): - from django.conf.urls.defaults import patterns, url + from django.conf.urls import patterns, url def wrap(view): def wrapper(*args, **kwargs): From ce7f3b73067d52eaefb6512b20daa3275bcfd407 Mon Sep 17 00:00:00 2001 From: Sergey Dobrov Date: Wed, 5 Mar 2014 17:23:58 +0200 Subject: [PATCH 3/4] Django 1.6 required url name to ends with changelist instead of list --- singleton_models/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/singleton_models/admin.py b/singleton_models/admin.py index 27a7bfa..b3b3d5f 100644 --- a/singleton_models/admin.py +++ b/singleton_models/admin.py @@ -31,7 +31,7 @@ def wrapper(*args, **kwargs): url(r'^$', wrap(self.change_view), {'object_id': '1'}, - name='%s_%s_change' % info), + name='%s_%s_changelist' % info), ) return urlpatterns From ef1f47c1a617437242d00a7f9fee4fe398d57188 Mon Sep 17 00:00:00 2001 From: Sergey Dobrov Date: Thu, 2 Jul 2015 16:25:20 +0200 Subject: [PATCH 4/4] update to be compatible with django 1.8 --- singleton_models/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/singleton_models/admin.py b/singleton_models/admin.py index b3b3d5f..8c26fc6 100644 --- a/singleton_models/admin.py +++ b/singleton_models/admin.py @@ -21,7 +21,7 @@ def wrapper(*args, **kwargs): return self.admin_site.admin_view(view)(*args, **kwargs) return update_wrapper(wrapper, view) - info = self.model._meta.app_label, self.model._meta.module_name + info = self.model._meta.app_label, self.model._meta.model_name urlpatterns = patterns('', url(r'^history/$',