Merge branch 'master' of /srv/git/projects/parabolaweb

1 files changed, 6 insertions, 3 deletions

diff --git a/todolists/urls.py b/todolists/urls.py
index 187d4820..2612a52e 100644
--- a/todolists/urls.py
+++ b/todolists/urls.py
@@ -1,13 +1,16 @@
 from django.conf.urls.defaults import patterns
+from django.contrib.auth.decorators import permission_required
+
+from .views import DeleteTodolist
 
 urlpatterns = patterns('todolists.views',
-    (r'^$',                       'list'),
+    (r'^$',                       'todolist_list'),
     (r'^(\d+)/$',                 'view'),
     (r'^add/$',                   'add'),
     (r'^edit/(?P<list_id>\d+)/$', 'edit'),
     (r'^flag/(\d+)/(\d+)/$',      'flag'),
-    (r'^delete/(?P<object_id>\d+)/$',
-        'delete_todolist'),
+    (r'^delete/(?P<pk>\d+)/$',
+        permission_required('main.delete_todolist')(DeleteTodolist.as_view())),
 )
 
 # vim: set ts=4 sw=4 et: