aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/moderation/tools.py
diff options
context:
space:
mode:
authorJessica Tallon <tsyesika@tsyesika.se>2015-10-20 13:02:15 +0000
committerJessica Tallon <tsyesika@tsyesika.se>2015-10-20 13:02:15 +0000
commit03bb1b7907d2d0fa522bf4705e4891494839da09 (patch)
treef60658eb937886dfd1cc349cab605c13a02942e5 /mediagoblin/moderation/tools.py
parentfd703bb4d0665958d853b89f6069eefd8a8c8113 (diff)
parent64a456a4e50b03e4fa2b33ceb208e88d2e02fce7 (diff)
downloadmediagoblin-03bb1b7907d2d0fa522bf4705e4891494839da09.tar.lz
mediagoblin-03bb1b7907d2d0fa522bf4705e4891494839da09.tar.xz
mediagoblin-03bb1b7907d2d0fa522bf4705e4891494839da09.zip
Merge branch 'comments'
Diffstat (limited to 'mediagoblin/moderation/tools.py')
-rw-r--r--mediagoblin/moderation/tools.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py
index d1fedb0e..73afd051 100644
--- a/mediagoblin/moderation/tools.py
+++ b/mediagoblin/moderation/tools.py
@@ -68,14 +68,14 @@ def take_punitive_actions(request, form, report, user):
if u'delete' in form.action_to_resolve.data and \
report.is_comment_report():
- deleted_comment = report.comment
+ deleted_comment = report.obj()
Session.delete(deleted_comment)
form.resolution_content.data += \
_(u"\n{mod} deleted the comment.").format(
mod=request.user.username)
elif u'delete' in form.action_to_resolve.data and \
report.is_media_entry_report():
- deleted_media = report.media_entry
+ deleted_media = report.obj()
deleted_media.delete()
form.resolution_content.data += \
_(u"\n{mod} deleted the media entry.").format(