From b4fd513f9f48f4658258ccae31ecf2e58d550d8b Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Tue, 18 Oct 2005 04:58:34 +0000 Subject: [PATCH] Moved views.admin.main to contrib.admin.views.main. Refs #627. Note that this is still backwards-compatible, assuming people are using django.conf.urls.admin as their admin URLconf git-svn-id: http://code.djangoproject.com/svn/django/trunk@927 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/urls/admin.py | 12 ++++++------ django/{views/admin => contrib/admin/views}/main.py | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename django/{views/admin => contrib/admin/views}/main.py (100%) diff --git a/django/conf/urls/admin.py b/django/conf/urls/admin.py index e33d377575..d03b88ceb4 100644 --- a/django/conf/urls/admin.py +++ b/django/conf/urls/admin.py @@ -2,7 +2,7 @@ from django.conf.urls.defaults import * from django.conf.settings import INSTALLED_APPS urlpatterns = ( - ('^$', 'django.views.admin.main.index'), + ('^$', 'django.contrib.admin.views.main.index'), ('^logout/$', 'django.views.auth.login.logout'), ('^password_change/$', 'django.views.registration.passwords.password_change'), ('^password_change/done/$', 'django.views.registration.passwords.password_change_done'), @@ -48,10 +48,10 @@ if 'ellington.media' in INSTALLED_APPS: urlpatterns += ( # Metasystem admin pages - ('^(?P[^/]+)/(?P[^/]+)/$', 'django.views.admin.main.change_list'), - ('^(?P[^/]+)/(?P[^/]+)/add/$', 'django.views.admin.main.add_stage'), - ('^(?P[^/]+)/(?P[^/]+)/(?P.+)/history/$', 'django.views.admin.main.history'), - ('^(?P[^/]+)/(?P[^/]+)/(?P.+)/delete/$', 'django.views.admin.main.delete_stage'), - ('^(?P[^/]+)/(?P[^/]+)/(?P.+)/$', 'django.views.admin.main.change_stage'), + ('^(?P[^/]+)/(?P[^/]+)/$', 'django.contrib.admin.views.main.change_list'), + ('^(?P[^/]+)/(?P[^/]+)/add/$', 'django.contrib.admin.views.main.add_stage'), + ('^(?P[^/]+)/(?P[^/]+)/(?P.+)/history/$', 'django.contrib.admin.views.main.history'), + ('^(?P[^/]+)/(?P[^/]+)/(?P.+)/delete/$', 'django.contrib.admin.views.main.delete_stage'), + ('^(?P[^/]+)/(?P[^/]+)/(?P.+)/$', 'django.contrib.admin.views.main.change_stage'), ) urlpatterns = patterns('', *urlpatterns) diff --git a/django/views/admin/main.py b/django/contrib/admin/views/main.py similarity index 100% rename from django/views/admin/main.py rename to django/contrib/admin/views/main.py