summaryrefslogtreecommitdiff
path: root/tests/urls.py
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2011-09-20 18:30:06 +0000
committerRamiro Morales <cramm0@gmail.com>2011-09-20 18:30:06 +0000
commitaaf77c1676e44019abe544911ff7a06eb2690295 (patch)
treef73ab5be90d41006ee52ca8942cfb542ea662a0f /tests/urls.py
parent7b21bfc0745f92f83a6826a3d3e58797fb74e326 (diff)
downloaddjango-aaf77c1676e44019abe544911ff7a06eb2690295.tar.gz
Converted internal link generation in the admin and admin document generator to use named URLs.
Thanks to Florian Apolloner for both the initial patch and his final push to get this fixed, to Dario Ocles for his great work on the admin templates and switching the admin_doc application to also use named URLs, to Mikko Hellsing for his comments and to Jannis and Julien for their review and design guidance. Fixes #15294. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/urls.py')
-rw-r--r--tests/urls.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/urls.py b/tests/urls.py
index 044395039d..e7c23e5144 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,6 +1,5 @@
from django.conf.urls import patterns, include
-
urlpatterns = patterns('',
# test_client modeltest urls
(r'^test_client/', include('modeltests.test_client.urls')),
@@ -25,4 +24,7 @@ urlpatterns = patterns('',
# admin widget tests
(r'widget_admin/', include('regressiontests.admin_widgets.urls')),
+ # admin custom URL tests
+ (r'^custom_urls/', include('regressiontests.admin_custom_urls.urls')),
+
)