aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages/views.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2012-03-17 17:18:15 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2012-03-17 17:18:15 -0500
commit16fca040d5d27879f244ded2b7455acfb7b6405f (patch)
tree65efa3cbc225c7ca1eb64820e295942638d5f26b /mediagoblin/user_pages/views.py
parent2011f2d89eebd56a5b141ccedb0968b018459bc1 (diff)
parenta0a7f87f625ca29ccddc123eb6540aa15a779eb7 (diff)
downloadmediagoblin-16fca040d5d27879f244ded2b7455acfb7b6405f.tar.lz
mediagoblin-16fca040d5d27879f244ded2b7455acfb7b6405f.tar.xz
mediagoblin-16fca040d5d27879f244ded2b7455acfb7b6405f.zip
Merge remote-tracking branch 'brett/bug264-delete-comments-with-media'
Diffstat (limited to 'mediagoblin/user_pages/views.py')
-rw-r--r--mediagoblin/user_pages/views.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 530dea64..6eff684c 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -173,6 +173,10 @@ def media_confirm_delete(request, media):
if form.confirm.data is True:
username = media.get_uploader.username
+ # Delete all the associated comments
+ for comment in media.get_comments():
+ comment.delete()
+
# Delete all files on the public storage
delete_media_files(media)