[views] Restructure profile view, simplify bundle access

[patchwork] / apps / patchwork / urls.py

diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index 4a7ccb19552c08f931a1794f41edf5bbd4017aa2..4352db0e0d16a4d5d3552c4d3e07209386c06faa 100644 (file)
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -18,6 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.conf.urls.defaults import *
+from django.conf import settings
 
 urlpatterns = patterns('',
     # Example:
@@ -30,23 +31,17 @@ urlpatterns = patterns('',
     (r'^patch/(?P<patch_id>\d+)/raw/$', 'patchwork.views.patch.content'),
     (r'^patch/(?P<patch_id>\d+)/mbox/$', 'patchwork.views.patch.mbox'),
 
-    # registration process
-    (r'^register/$', 'patchwork.views.user.register'),
-    (r'^register/confirm/(?P<key>[^/]+)/$',
-        'patchwork.views.user.register_confirm'),
-
-    (r'^login/$', 'patchwork.views.user.login'),
-    (r'^logout/$', 'patchwork.views.user.logout'),
-
     # logged-in user stuff
     (r'^user/$', 'patchwork.views.user.profile'),
     (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'),
+        'patchwork.views.bundle.bundle'),
     (r'^user/bundle/(?P<bundle_id>[^/]+)/mbox/$',
-       'patchwork.views.bundle.mbox'),
+        'patchwork.views.bundle.mbox'),
 
     (r'^user/link/$', 'patchwork.views.user.link'),
     (r'^user/link/(?P<key>[^/]+)/$', 'patchwork.views.user.link_confirm'),
@@ -58,4 +53,15 @@ urlpatterns = patterns('',
 
     # submitter autocomplete
     (r'^submitter/$', 'patchwork.views.submitter_complete'),
+
+    # help!
+    (r'^help/(?P<path>.*)$', 'patchwork.views.help'),
 )
+
+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'),
+    )