bundles: Remove separate public bundle views

[patchwork] / apps / patchwork / urls.py

diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index c969b2954d356faddf3f665f7f95e69b118e9245..a44f17cd88195059833fbc1f03ea4c2144629c92 100644 (file)
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -19,12 +19,13 @@
 
 from django.conf.urls.defaults import *
 from django.conf import settings
+from django.contrib.auth import views as auth_views
 
 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,22 +37,45 @@ urlpatterns = patterns('',
     (r'^user/todo/$', 'patchwork.views.user.todo_lists'),
     (r'^user/todo/(?P<project_id>[^/]+)/$', 'patchwork.views.user.todo_list'),
 
-    (r'^user/bundle/(?P<bundle_id>[^/]+)/$',
-        'patchwork.views.bundle.bundle'),
-    (r'^user/bundle/(?P<bundle_id>[^/]+)/mbox/$',
-        'patchwork.views.bundle.mbox'),
+    (r'^user/bundles/$',
+        'patchwork.views.bundle.bundles'),
 
     (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'),
 
+    # password change
+    url(r'^user/password-change/$', auth_views.password_change,
+            name='auth_password_change'),
+    url(r'^user/password-change/done/$', auth_views.password_change_done,
+            name='auth_password_change_done'),
+
+    # login/logout
+    url(r'^user/login/$', auth_views.login,
+        {'template_name': 'patchwork/login.html'},
+        name = 'auth_login'),
+    url(r'^user/logout/$', auth_views.logout,
+        {'template_name': 'patchwork/logout.html'},
+        name = 'auth_logout'),
+
+    # registration
+    (r'^register/', 'patchwork.views.user.register'),
+
     # public view for bundles
     (r'^bundle/(?P<username>[^/]*)/(?P<bundlename>[^/]*)/$',
-                                'patchwork.views.bundle.public'),
+                                'patchwork.views.bundle.bundle'),
+    (r'^bundle/(?P<username>[^/]*)/(?P<bundlename>[^/]*)/mbox/$',
+                                'patchwork.views.bundle.mbox'),
+
+    (r'^confirm/(?P<key>[0-9a-f]+)/$', 'patchwork.views.confirm'),
 
     # submitter autocomplete
     (r'^submitter/$', 'patchwork.views.submitter_complete'),
 
+    # email setup
+    (r'^mail/$', 'patchwork.views.mail.settings'),
+    (r'^mail/optout/$', 'patchwork.views.mail.optout'),
+    (r'^mail/optin/$', 'patchwork.views.mail.optin'),
+
     # help!
     (r'^help/(?P<path>.*)$', 'patchwork.views.help'),
 )
@@ -63,3 +87,13 @@ if settings.ENABLE_XMLRPC:
         (r'^project/(?P<project_id>[^/]+)/pwclientrc/$',
              'patchwork.views.pwclientrc'),
     )
+
+# redirect from old urls
+if settings.COMPAT_REDIR:
+    urlpatterns += patterns('',
+        (r'^user/bundle/(?P<bundle_id>[^/]+)/$',
+            'patchwork.views.bundle.bundle_redir'),
+        (r'^user/bundle/(?P<bundle_id>[^/]+)/mbox/$',
+            'patchwork.views.bundle.mbox_redir'),
+    )
+