Skip to content

Commit 86c8610

Browse files
author
Dmitriy Kosolapov
committed
compatible with django 2.2
1 parent e160bf5 commit 86c8610

File tree

2 files changed

+29
-20
lines changed

2 files changed

+29
-20
lines changed

singleton_models/admin.py

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
import django
12
from django.contrib import admin
23
from django.utils.translation import ugettext as _
3-
from django.utils.encoding import force_unicode
4+
5+
if django.VERSION >= (1, 8):
6+
from django.utils.encoding import force_text
7+
else:
8+
from django.utils.encoding import force_unicode as force_text
9+
410
from django.http import HttpResponseRedirect
511
from functools import update_wrapper
612

@@ -18,28 +24,31 @@ def has_delete_permission(self, request, obj=None):
1824
return False
1925

2026
def get_urls(self):
21-
try:
22-
from django.conf.urls.defaults import patterns, url
23-
except ImportError:
24-
from django.conf.urls import patterns, url
25-
2627
def wrap(view):
2728
def wrapper(*args, **kwargs):
2829
return self.admin_site.admin_view(view)(*args, **kwargs)
2930
return update_wrapper(wrapper, view)
3031

31-
info = self.model._meta.app_label, self.model._meta.module_name
32+
info = self.model._meta.app_label, self.model._meta.model_name
3233

33-
urlpatterns = patterns('',
34-
url(r'^history/$',
35-
wrap(self.history_view),
36-
{'object_id': '1'},
37-
name='%s_%s_history' % info),
38-
url(r'^$',
39-
wrap(self.change_view),
40-
{'object_id': '1'},
41-
name='%s_%s_changelist' % info),
42-
)
34+
if django.VERSION >= (1, 8):
35+
from django.urls import path
36+
urlpatterns = [
37+
path(r'history/', wrap(self.history_view), {'object_id': '1'}, name='%s_%s_history' % info),
38+
path(r'', wrap(self.change_view), {'object_id': '1'}, name='%s_%s_changelist' % info),
39+
]
40+
else:
41+
try:
42+
from django.conf.urls.defaults import patterns, url
43+
except ImportError:
44+
from django.conf.urls import patterns, url
45+
info = self.model._meta.app_label, self.model._meta.module_name
46+
47+
urlpatterns = patterns(
48+
'',
49+
url(r'^history/$', wrap(self.history_view), {'object_id': '1'}, name='%s_%s_history' % info),
50+
url(r'^$', wrap(self.change_view), {'object_id': '1'}, name='%s_%s_changelist' % info),
51+
)
4352
return urlpatterns
4453

4554
def response_change(self, request, obj):
@@ -48,8 +57,8 @@ def response_change(self, request, obj):
4857
"""
4958
opts = obj._meta
5059

51-
msg = _('%(obj)s was changed successfully.') % {'obj': force_unicode(obj)}
52-
if request.POST.has_key("_continue"):
60+
msg = _('%(obj)s was changed successfully.') % {'obj': force_text(obj)}
61+
if request.POST.get("_continue"):
5362
self.message_user(request, msg + ' ' + _("You may edit it again below."))
5463
return HttpResponseRedirect(request.path)
5564
else:

singleton_models/templates/admin/singleton_models/change_form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block breadcrumbs %}
55
<div class="breadcrumbs">
66
<a href="../../">{% trans 'Home' %}</a> &rsaquo;
7-
<a href="../">{{ app_label|capfirst|escape }}</a> &rsaquo;
7+
<a href="../">{{ opts.app_config.verbose_name|default:app_label|capfirst|escape }}</a> &rsaquo;
88
{{ opts.verbose_name|capfirst }}
99
</div>
1010
{% endblock %}

0 commit comments

Comments
 (0)