From 08750772eaf140266d1be0aac5024f581664012b Mon Sep 17 00:00:00 2001 From: Mark Holmquist Date: Mon, 22 Aug 2011 02:57:40 -0700 Subject: + 'confirm' section for confirmation dialogues + implemented delete functionality * fixed several instances of 'must be an instance of unicode, not str' --- mediagoblin/user_pages/routing.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index bf9f12ab..1283355a 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -29,6 +29,8 @@ user_routes = [ controller="mediagoblin.user_pages.views:media_home"), Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/", controller="mediagoblin.edit.views:edit_media"), + Route('mediagoblin.confirm.confirm_delete', "/{user}/m/{media}/confirm/", + controller="mediagoblin.confirm.views:confirm_delete"), Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/', controller="mediagoblin.user_pages.views:atom_feed"), Route('mediagoblin.user_pages.media_post_comment', -- cgit v1.2.3 From 39b45e203507b6cdb25491b719bfa152cb0241f7 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 29 Aug 2011 08:05:35 -0500 Subject: I think confirm_delete deserves a url like /confirm-delete/ rather than /confirm/ Adjusting appropriately. --- mediagoblin/user_pages/routing.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 55ee8e4d..2c83593f 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -32,8 +32,9 @@ user_routes = [ Route('mediagoblin.edit.attachments', '/{user}/m/{media}/attachments/', controller="mediagoblin.edit.views:edit_attachments"), - Route('mediagoblin.confirm.confirm_delete', "/{user}/m/{media}/confirm/", - controller="mediagoblin.confirm.views:confirm_delete"), + Route('mediagoblin.confirm.confirm_delete', + "/{user}/m/{media}/confirm-delete/", + controller="mediagoblin.confirm.views:confirm_delete"), Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/', controller="mediagoblin.user_pages.views:atom_feed"), Route('mediagoblin.user_pages.media_post_comment', -- cgit v1.2.3 From 502073f2bf65380be18b349a678ac075777889a4 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Tue, 30 Aug 2011 23:16:46 +0200 Subject: Feature #403 - Ability to delete media entries - Fixes according to feedback * Moved `mediagoblin.confirm` stuff to `mediagoblin.user_pages`, templates too. * Removed route extension for `mediagoblin.confirm` * Created `delete_media_files` which deletes all media files on the public_store when the entry is deleted * Created a new decorator to check if a user has the permission to delete an entry. --- mediagoblin/user_pages/routing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mediagoblin/user_pages/routing.py') diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 2c83593f..ffa6f969 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -32,9 +32,9 @@ user_routes = [ Route('mediagoblin.edit.attachments', '/{user}/m/{media}/attachments/', controller="mediagoblin.edit.views:edit_attachments"), - Route('mediagoblin.confirm.confirm_delete', + Route('mediagoblin.user_pages.media_confirm_delete', "/{user}/m/{media}/confirm-delete/", - controller="mediagoblin.confirm.views:confirm_delete"), + controller="mediagoblin.user_pages.views:media_confirm_delete"), Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/', controller="mediagoblin.user_pages.views:atom_feed"), Route('mediagoblin.user_pages.media_post_comment', -- cgit v1.2.3