tox: Add tox.ini file

[patchwork] / apps / patchwork / urls.py

diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index 10fc3b900d9653188f6d4ac6901a54599d8f2048..b28eb90ba6b03245d5a960e6df269bba305b649c 100644 (file)
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -17,12 +17,16 @@
 # along with Patchwork; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 from django.conf import settings
+from django.contrib import admin
 from django.contrib.auth import views as auth_views
 
+admin.autodiscover()
+
 urlpatterns = patterns('',
-    # Example:
+    url(r'^admin/', include(admin.site.urls)),
+
     (r'^$', 'patchwork.views.projects'),
     (r'^project/(?P<project_id>[^/]+)/list/$', 'patchwork.views.patch.list'),
     (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project.project'),
@@ -39,19 +43,15 @@ urlpatterns = patterns('',
 
     (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/unlink/(?P<person_id>[^/]+)/$', 'patchwork.views.user.unlink'),
 
     # password change
     url(r'^user/password-change/$', auth_views.password_change,
-            name='auth_password_change'),
+            name='password_change'),
     url(r'^user/password-change/done/$', auth_views.password_change_done,
-            name='auth_password_change_done'),
+            name='password_change_done'),
 
     # login/logout
     url(r'^user/login/$', auth_views.login,
@@ -66,7 +66,9 @@ urlpatterns = patterns('',
 
     # 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'),
 
@@ -89,3 +91,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'),
+    )
+