From c50379dda534564eb5701d8c007910bc1ee7e066 Mon Sep 17 00:00:00 2001 From: Dirk Wallenstein Date: Fri, 1 Apr 2011 07:12:15 +0000 Subject: admin: Streamline admin model registration Use autodiscover and the new way to hook AdminSite into the URLconf. AdminSite.root() will be removed in Django-1.3 as noted here: http://docs.djangoproject.com/en/dev/internals/deprecation/ Signed-off-by: Dirk Wallenstein Signed-off-by: Jeremy Kerr --- apps/urls.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apps/urls.py') diff --git a/apps/urls.py b/apps/urls.py index 7ec5dd8..3894708 100644 --- a/apps/urls.py +++ b/apps/urls.py @@ -21,11 +21,13 @@ import os from django.conf.urls.defaults import * from django.conf import settings -from patchwork.admin import admin_site +from django.contrib import admin from registration.views import register from patchwork.forms import RegistrationForm +admin.autodiscover() + htdocs = os.path.join(settings.ROOT_DIR, 'htdocs') urlpatterns = patterns('', @@ -40,7 +42,7 @@ urlpatterns = patterns('', (r'^accounts/', include('registration.urls')), # Uncomment this for admin: - (r'^admin/(.*)', admin_site.root), + (r'^admin/', include(admin.site.urls)), (r'^css/(?P.*)$', 'django.views.static.serve', {'document_root': os.path.join(htdocs, 'css')}), -- cgit v1.2.3