diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-01-14 20:22:25 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-01-14 20:22:25 +0000 |
| commit | 1f84630c87f8032b0167e6db41acaf50ab710879 (patch) | |
| tree | 97b7ddd8adb847b0a3461b75cb0e5b215c7d7db0 /tests/regressiontests/admin_views/urls.py | |
| parent | 6c4e5f0f0e9469d7e56d824d2b153cd25fb443ee (diff) | |
Fixed #6470: made the admin use a URL resolver.
This *is* backwards compatible, but `admin.site.root()` has been deprecated. The new style is `('^admin/', include(admin.site.urls))`; users will need to update their code to take advantage of the new customizable admin URLs.
Thanks to Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/admin_views/urls.py')
| -rw-r--r-- | tests/regressiontests/admin_views/urls.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/regressiontests/admin_views/urls.py b/tests/regressiontests/admin_views/urls.py index 4e5da48e13..f3f1fbd43a 100644 --- a/tests/regressiontests/admin_views/urls.py +++ b/tests/regressiontests/admin_views/urls.py @@ -1,9 +1,11 @@ from django.conf.urls.defaults import * from django.contrib import admin import views +import customadmin urlpatterns = patterns('', (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/secure-view/$', views.secure_view), - (r'^admin/(.*)', admin.site.root), + (r'^admin/', include(admin.site.urls)), + (r'^admin2/', include(customadmin.site.urls)), ) |