From c8ece67cec9c421ac0c711554edd34f022623b45 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 28 Dec 2012 00:27:20 -0600 Subject: Convert to using new todolist models everywhere This is a rather widespread set of changes converting usage to the new todo list and todo list package model recently introduced. The data migration is not included in this commit. After this commit, the old model should no longer be referenced anywhere. Signed-off-by: Dan McGee --- todolists/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'todolists/urls.py') diff --git a/todolists/urls.py b/todolists/urls.py index a379468f..81ac11f5 100644 --- a/todolists/urls.py +++ b/todolists/urls.py @@ -11,7 +11,7 @@ urlpatterns = patterns('todolists.views', (r'^edit/(?P\d+)/$', 'edit'), (r'^flag/(\d+)/(\d+)/$', 'flag'), (r'^delete/(?P\d+)/$', - permission_required('main.delete_todolist')(DeleteTodolist.as_view())), + permission_required('todolists.delete_todolist')(DeleteTodolist.as_view())), ) # vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b From 0c94cc4465530866da7b6437975a287aa7f063a8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 28 Dec 2012 10:06:32 -0600 Subject: Use todolist slugs for all URLs Signed-off-by: Dan McGee --- todolists/urls.py | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'todolists/urls.py') diff --git a/todolists/urls.py b/todolists/urls.py index 81ac11f5..cbc9547e 100644 --- a/todolists/urls.py +++ b/todolists/urls.py @@ -1,17 +1,26 @@ from django.conf.urls import patterns -from django.contrib.auth.decorators import permission_required +from django.contrib.auth.decorators import login_required, permission_required -from .views import DeleteTodolist +from .views import (view_redirect, view, todolist_list, add, edit, flag, + list_pkgbases, DeleteTodolist) -urlpatterns = patterns('todolists.views', - (r'^$', 'todolist_list'), - (r'^(?P\d+)/$', 'view'), - (r'^(?P\d+)/pkgbases/(?P[a-z]+)/$', 'list_pkgbases'), - (r'^add/$', 'add'), - (r'^edit/(?P\d+)/$', 'edit'), - (r'^flag/(\d+)/(\d+)/$', 'flag'), - (r'^delete/(?P\d+)/$', +urlpatterns = patterns('', + (r'^$', login_required(todolist_list)), + + # old todolists URLs, permanent redirect view so we don't break all links + (r'^(?P\d+)/$', view_redirect), + + (r'^add/$', + permission_required('todolists.add_todolist')(add)), + (r'^(?P[-\w]+)/$', login_required(view)), + (r'^(?P[-\w]+)/edit/$', + permission_required('todolists.change_todolist')(edit)), + (r'^(?P[-\w]+)/delete/$', permission_required('todolists.delete_todolist')(DeleteTodolist.as_view())), + (r'^(?P[-\w]+)/flag/(?P\d+)/$', + permission_required('todolists.change_todolistpackage')(flag)), + (r'^(?P[-\w]+)/pkgbases/(?P[a-z]+)/$', + 'list_pkgbases'), ) # vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b From 827b426b4dce6641e77dac975dae180ce6e20b0a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 31 Dec 2012 11:04:41 -0600 Subject: Fix list_pkgbases view call Signed-off-by: Dan McGee --- todolists/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'todolists/urls.py') diff --git a/todolists/urls.py b/todolists/urls.py index cbc9547e..a4f93da7 100644 --- a/todolists/urls.py +++ b/todolists/urls.py @@ -20,7 +20,7 @@ urlpatterns = patterns('', (r'^(?P[-\w]+)/flag/(?P\d+)/$', permission_required('todolists.change_todolistpackage')(flag)), (r'^(?P[-\w]+)/pkgbases/(?P[a-z]+)/$', - 'list_pkgbases'), + list_pkgbases), ) # vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b From 6172b6dd09f932de8db7ab69641370d78d25a4c2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 11 Mar 2013 18:48:29 -0500 Subject: Make todolists fully public Remove the login_required decorator from the index and detail views to allow everyone to see the same thing. Of course, when I say "same" here, unauthenticated users don't see the same links developers do to mark packages complete and incomplete. Signed-off-by: Dan McGee --- todolists/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'todolists/urls.py') diff --git a/todolists/urls.py b/todolists/urls.py index a4f93da7..6617d7dd 100644 --- a/todolists/urls.py +++ b/todolists/urls.py @@ -1,18 +1,18 @@ from django.conf.urls import patterns -from django.contrib.auth.decorators import login_required, permission_required +from django.contrib.auth.decorators import permission_required from .views import (view_redirect, view, todolist_list, add, edit, flag, list_pkgbases, DeleteTodolist) urlpatterns = patterns('', - (r'^$', login_required(todolist_list)), + (r'^$', todolist_list), # old todolists URLs, permanent redirect view so we don't break all links (r'^(?P\d+)/$', view_redirect), (r'^add/$', permission_required('todolists.add_todolist')(add)), - (r'^(?P[-\w]+)/$', login_required(view)), + (r'^(?P[-\w]+)/$', view), (r'^(?P[-\w]+)/edit/$', permission_required('todolists.change_todolist')(edit)), (r'^(?P[-\w]+)/delete/$', -- cgit v1.2.3-2-g168b