]> git.ozlabs.org Git - patchwork/blobdiff - apps/urls.py
bundles: Don't allow slashes in bundle names
[patchwork] / apps / urls.py
index 7ec5dd86fd9633a842239e53f8f3a2892a5d22e5..4ddef9e15532e864a7cc2a963d60113fea10b45b 100644 (file)
@@ -21,10 +21,9 @@ 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')
 
@@ -32,15 +31,8 @@ urlpatterns = patterns('',
     # Example:
     (r'^', include('patchwork.urls')),
 
-    # override the default registration form
-    url(r'^accounts/register/$',
-        register, {'form_class': RegistrationForm},
-        name='registration_register'),
-
-    (r'^accounts/', include('registration.urls')),
-
     # Uncomment this for admin:
-     (r'^admin/(.*)', admin_site.root),
+     (r'^admin/', include(admin.site.urls)),
 
      (r'^css/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': os.path.join(htdocs, 'css')}),