Skip to content

Commit b5b6ab7

Browse files
sshwsfcsshwsfc
committed
Update tests for the new instance method of the AdminSite class
1 parent 4c17aa0 commit b5b6ab7

26 files changed

+42
-37
lines changed

‎demo_app/demo/settings.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
'django.contrib.sessions',
134134
'django.contrib.messages',
135135
'django.contrib.staticfiles',
136+
'django.contrib.admin',
136137

137138
'xadmin',
138139
'crispy_forms',

‎demo_app/demo/urls.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
# from xadmin.plugins import xversion
88
# xversion.register_models()
99

10+
from django.contrib import admin
11+
admin.autodiscover()
12+
1013
urlpatterns = patterns('',
11-
url(r'', include(xadmin.site.urls)),
12-
)
14+
url(r'^admin/', include(admin.site.urls)),
15+
url(r'^', include(xadmin.site.urls))
16+
)

‎tests/xtests/view_base/adminx.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from xadmin.views import BaseAdminView, CommAdminView, ListAdminView
33
from models import ModelA, ModelB
44

5-
site = AdminSite('views_base','Views Base')
5+
site = AdminSite('views_base')
66

77
class ModelAAdmin(object):
88
test_model_attr = 'test_model'

‎xadmin/plugins/bookmark.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def get_context(self, context):
4747
model_info = (self.opts.app_label, self.opts.module_name)
4848
has_selected = False
4949
menu_title = _(u"Bookmark")
50-
list_base_url = reverse('admin:%s_%s_changelist' %
50+
list_base_url = reverse('xadmin:%s_%s_changelist' %
5151
model_info, current_app=self.admin_site.name)
5252

5353
# local bookmarks
@@ -78,7 +78,7 @@ def check_item(i):
7878
bk_model_info = (Bookmark._meta.app_label, Bookmark._meta.module_name)
7979
bookmarks_queryset = Bookmark.objects.filter(
8080
content_type=content_type,
81-
url_name='admin:%s_%s_changelist' % model_info
81+
url_name='xadmin:%s_%s_changelist' % model_info
8282
).filter(Q(user=self.user) | Q(is_share=True))
8383

8484
for bk in bookmarks_queryset:
@@ -90,13 +90,13 @@ def check_item(i):
9090
change_or_detail = 'detail'
9191

9292
bookmarks.append({'title': bk.title, 'selected': selected, 'url': bk.url, 'edit_url':
93-
reverse('admin:%s_%s_%s' % (bk_model_info[0], bk_model_info[1], change_or_detail),
93+
reverse('xadmin:%s_%s_%s' % (bk_model_info[0], bk_model_info[1], change_or_detail),
9494
args=(bk.id,))})
9595
if selected:
9696
menu_title = bk.title
9797
has_selected = True
9898

99-
post_url = reverse('admin:%s_%s_bookmark' % model_info,
99+
post_url = reverse('xadmin:%s_%s_bookmark' % model_info,
100100
current_app=self.admin_site.name)
101101

102102
new_context = {
@@ -128,7 +128,7 @@ class BookmarkView(ModelAdminView):
128128
@transaction.commit_on_success
129129
def post(self, request):
130130
model_info = (self.opts.app_label, self.opts.module_name)
131-
url_name = 'admin:%s_%s_changelist' % model_info
131+
url_name = 'xadmin:%s_%s_changelist' % model_info
132132
bookmark = Bookmark(
133133
content_type=ContentType.objects.get_for_model(self.model),
134134
title=request.POST[

‎xadmin/plugins/topnav.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def block_top_navbar(self, context, nodes):
3333
try:
3434
search_models.append({
3535
'title': _('Search %s') % capfirst(model._meta.verbose_name_plural),
36-
'url': reverse('admin:%s_%s_changelist' % info, current_app=site_name),
36+
'url': reverse('xadmin:%s_%s_changelist' % info, current_app=site_name),
3737
'model': model
3838
})
3939
except NoReverseMatch:
@@ -56,7 +56,7 @@ def block_top_navmenu(self, context, nodes):
5656
try:
5757
add_models.append({
5858
'title': _('Add %s') % capfirst(model._meta.verbose_name),
59-
'url': reverse('admin:%s_%s_add' % info, current_app=site_name),
59+
'url': reverse('xadmin:%s_%s_add' % info, current_app=site_name),
6060
'model': model
6161
})
6262
except NoReverseMatch:

‎xadmin/sites.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def __new__(cls, name, bases, attrs):
2424

2525
class AdminSite(object):
2626

27-
def __init__(self, name='admin', app_name='admin'):
27+
def __init__(self, name='xadmin'):
2828
self.name = name
29-
self.app_name = app_name
29+
self.app_name = 'xadmin'
3030

3131
self._registry = {} # model_class class -> admin_class class
3232
self._registry_avs = {} # admin_view_class class -> admin_class class
@@ -322,7 +322,7 @@ def wrapper(*args, **kwargs):
322322

323323
@property
324324
def urls(self):
325-
return self.get_urls(), self.app_name, self.name
325+
return self.get_urls(), self.name, self.app_name
326326

327327
def i18n_javascript(self, request):
328328
"""

‎xadmin/templates/xadmin/500.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{% block breadcrumbs %}
66
<div class="breadcrumbs">
7-
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
7+
<a href="{% url 'xadmin:index' %}">{% trans 'Home' %}</a>
88
&rsaquo; {% trans 'Server error' %}
99
</div>
1010
{% endblock %}

‎xadmin/templates/xadmin/auth/password_reset/email.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% trans "Please go to the following page and choose a new password:" %}
55
{% block reset_link %}
6-
{{ protocol }}://{{ domain }}{% url 'admin:xadmin_password_reset_confirm' uidb36=uid token=token %}
6+
{{ protocol }}://{{ domain }}{% url 'xadmin:xadmin_password_reset_confirm' uidb36=uid token=token %}
77
{% endblock %}
88
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
99

‎xadmin/templates/xadmin/auth/user/change_password.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
{% block breadcrumbs %}
88
{% if account_view %}
99
<ul class="breadcrumb">
10-
<li><a href="{% url 'admin:index' %}">{% trans 'Home' %}</a></li>
10+
<li><a href="{% url 'xadmin:index' %}">{% trans 'Home' %}</a></li>
1111
<li class="active">{% trans 'Change password' %}</li>
1212
</ul>
1313
{% else %}
1414
<ul class="breadcrumb">
15-
<li><a href="{% url 'admin:index' %}">{% trans 'Home' %}</a></li>
15+
<li><a href="{% url 'xadmin:index' %}">{% trans 'Home' %}</a></li>
1616
<li>
1717
{% if has_view_permission %}
1818
<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>

‎xadmin/templates/xadmin/base.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
{{ media.css }}
2020
{% block extrastyle %}{% endblock %}
2121
{% vendor 'jquery.js' %}
22-
{% url 'admin:index' as indexurl %}
22+
{% url 'xadmin:index' as indexurl %}
2323
<script type="text/javascript">
2424
window.__admin_media_prefix__ = "{% filter escapejs %}{% static "xadmin/" %}{% endfilter %}";
2525
window.__admin_path_prefix__ = "{% filter escapejs %}{{ indexurl }}{% endfilter %}";
2626
</script>
27-
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
27+
<script type="text/javascript" src="{% url 'xadmin:jsi18n' %}"></script>
2828
{% block extrahead %}{% endblock %}
2929
{% view_block 'extrahead' %}
3030
</head>

0 commit comments

Comments
 (0)