Use generic email confirmation object

[patchwork] / apps / urls.py

diff --git a/apps/urls.py b/apps/urls.py
index 5c4ac570717eef79f1b850395b2ea7c6bddae94e..3894708af605363d875a22f6ed70dbeb426e7c8b 100644 (file)
--- a/apps/urls.py
+++ b/apps/urls.py
@@ -17,13 +17,18 @@
 # along with Patchwork; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+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
-from patchwork.utils import userprofile_register_callback
+
+admin.autodiscover()
+
+htdocs = os.path.join(settings.ROOT_DIR, 'htdocs')
 
 urlpatterns = patterns('',
     # Example:
@@ -31,21 +36,19 @@ urlpatterns = patterns('',
 
     # override the default registration form
     url(r'^accounts/register/$',
-        register,
-        {'form_class': RegistrationForm,
-         'profile_callback': userprofile_register_callback},
+        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': '/srv/patchwork/htdocs/css'}),
+        {'document_root': os.path.join(htdocs, 'css')}),
      (r'^js/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': '/srv/patchwork/htdocs/js'}),
+        {'document_root': os.path.join(htdocs, 'js')}),
      (r'^images/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': '/srv/patchwork/htdocs/images'}),
+        {'document_root': os.path.join(htdocs, 'images')}),
 )