aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/moderation
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2013-10-03 17:07:11 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2013-10-03 17:07:11 -0400
commit0a24db84c5769149537b0d9bd8e3a88fe8e9522a (patch)
treed99a38cfc322fa643d2d0cc4a739a8ccb4e538ca /mediagoblin/moderation
parent9519c0a91f6c67883d62b656c971cc10e47ea967 (diff)
downloadmediagoblin-0a24db84c5769149537b0d9bd8e3a88fe8e9522a.tar.lz
mediagoblin-0a24db84c5769149537b0d9bd8e3a88fe8e9522a.tar.xz
mediagoblin-0a24db84c5769149537b0d9bd8e3a88fe8e9522a.zip
This was a very important update where I fixed a few small but fatal bugs in my
code. I had removed the import of Privilege in mediagoblin.db.migrations, and this was still necessary and was causing errors. I also made it so that media deletion by moderators, through reports, actually fully deleted the media, rather than just deleting the database representation of the media. Lastly, I fixed a bug in migration that caused a fatal error on login because the UserBan user_id column was improperly named in it's creation by migration.
Diffstat (limited to 'mediagoblin/moderation')
-rw-r--r--mediagoblin/moderation/tools.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py
index f519e5f3..e0337536 100644
--- a/mediagoblin/moderation/tools.py
+++ b/mediagoblin/moderation/tools.py
@@ -73,7 +73,7 @@ def take_punitive_actions(request, form, report, user):
elif u'delete' in form.action_to_resolve.data and \
report.is_media_entry_report():
deleted_media = report.media_entry
- Session.delete(deleted_media)
+ deleted_media.delete()
form.resolution_content.data += \
u"\n{mod} deleted the media entry.".format(
mod=request.user.username)