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.
This commit is contained in:
Joar Wandborg
2011-08-30 23:16:46 +02:00
parent 7d0efbae29
commit 502073f2bf
10 changed files with 135 additions and 9 deletions

View File

@@ -23,3 +23,10 @@ class MediaCommentForm(wtforms.Form):
comment_content = wtforms.TextAreaField(
_('Comment'),
[wtforms.validators.Required()])
class ConfirmDeleteForm(wtforms.Form):
confirm = wtforms.RadioField('Confirm',
default='False',
choices=[('False', 'No, I made a mistake!'),
('True', 'Yes, delete it!')])

View File

@@ -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',

View File

@@ -20,11 +20,11 @@ from mediagoblin import messages, mg_globals
from mediagoblin.db.util import DESCENDING, ObjectId
from mediagoblin.util import (
Pagination, render_to_response, redirect, cleaned_markdown_conversion,
render_404)
render_404, delete_media_files)
from mediagoblin.user_pages import forms as user_forms
from mediagoblin.decorators import (uses_pagination, get_user_media_entry,
require_active_login)
require_active_login, user_may_delete_media)
from werkzeug.contrib.atom import AtomFeed
@@ -145,6 +145,36 @@ def media_post_comment(request):
user = request.matchdict['user'])
@get_user_media_entry
@require_active_login
@user_may_delete_media
def media_confirm_delete(request, media):
form = user_forms.ConfirmDeleteForm(request.POST)
if request.method == 'POST' and form.validate():
if request.POST.get('confirm') == 'True':
username = media.uploader()['username']
# Delete all files on the public storage
delete_media_files(media)
media.delete()
return redirect(request, "mediagoblin.user_pages.user_home",
user=username)
else:
return redirect(request, "mediagoblin.user_pages.media_home",
user=media.uploader()['username'],
media=media['slug'])
return render_to_response(
request,
'mediagoblin/user_pages/media_confirm_delete.html',
{'media': media,
'form': form})
ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 15
def atom_feed(request):