Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Django 1.6 compatibility #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Django 1.6 compatibility #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96648df
use update_wrapper from builtin functools module to be compatible wit…
jbinary Mar 5, 2014
3bd8820
Django 1.6 has no urls.default module
jbinary Mar 5, 2014
ce7f3b7
Django 1.6 required url name to ends with changelist instead of list
jbinary Mar 5, 2014
ef1f47c
update to be compatible with django 1.8
jbinary Jul 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions singleton_models/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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):

Expand All @@ -13,14 +14,14 @@ 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):
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/$',
Expand All @@ -30,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

Expand Down