Use generic email confirmation object

[patchwork] / apps / patchwork / urls.py

diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index 20de7b8e96d4d66b0423038d185f0da797ed00ee..27c79fd57075d51f201c10a1f4d37543b5cfc577 100644 (file)
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -24,7 +24,7 @@ urlpatterns = patterns('',
     # Example:
     (r'^$', 'patchwork.views.projects'),
     (r'^project/(?P<project_id>[^/]+)/list/$', 'patchwork.views.patch.list'),
-    (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project'),
+    (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project.project'),
 
     # patch views
     (r'^patch/(?P<patch_id>\d+)/$', 'patchwork.views.patch.patch'),
@@ -36,19 +36,22 @@ urlpatterns = patterns('',
     (r'^user/todo/$', 'patchwork.views.user.todo_lists'),
     (r'^user/todo/(?P<project_id>[^/]+)/$', 'patchwork.views.user.todo_list'),
 
+    (r'^user/bundles/$',
+        'patchwork.views.bundle.bundles'),
     (r'^user/bundle/(?P<bundle_id>[^/]+)/$',
         'patchwork.views.bundle.bundle'),
     (r'^user/bundle/(?P<bundle_id>[^/]+)/mbox/$',
         'patchwork.views.bundle.mbox'),
 
     (r'^user/link/$', 'patchwork.views.user.link'),
-    (r'^user/link/(?P<key>[^/]+)/$', 'patchwork.views.user.link_confirm'),
     (r'^user/unlink/(?P<person_id>[^/]+)/$', 'patchwork.views.user.unlink'),
 
     # public view for bundles
     (r'^bundle/(?P<username>[^/]*)/(?P<bundlename>[^/]*)/$',
                                 'patchwork.views.bundle.public'),
 
+    (r'^confirm/(?P<key>[0-9a-f]+)/$', 'patchwork.views.confirm'),
+
     # submitter autocomplete
     (r'^submitter/$', 'patchwork.views.submitter_complete'),
 
@@ -58,6 +61,8 @@ urlpatterns = patterns('',
 
 if settings.ENABLE_XMLRPC:
     urlpatterns += patterns('',
+        (r'xmlrpc/$', 'patchwork.views.xmlrpc.xmlrpc'),
+        (r'^pwclient/$', 'patchwork.views.pwclient'),
         (r'^project/(?P<project_id>[^/]+)/pwclientrc/$',
              'patchwork.views.pwclientrc'),
     )