X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Furls.py;h=4ddef9e15532e864a7cc2a963d60113fea10b45b;hb=4bc2c34df5e5eb3e7153286f59aa8bdaf0c23dc0;hp=7ec5dd86fd9633a842239e53f8f3a2892a5d22e5;hpb=e84c31852aae3d1c79fe3cbb1aea2ca9646197ef;p=patchwork diff --git a/apps/urls.py b/apps/urls.py index 7ec5dd8..4ddef9e 100644 --- a/apps/urls.py +++ b/apps/urls.py @@ -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.*)$', 'django.views.static.serve', {'document_root': os.path.join(htdocs, 'css')}),