aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/moderation/tools.py
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2013-07-30 17:09:01 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2013-07-31 20:11:26 -0400
commit9d6e453f8fd337813c2933835aedff2949193fbe (patch)
tree99a307b30ea3bbc6cfc81c4e9d2ea437935e894e /mediagoblin/moderation/tools.py
parent52a355b27541597fc155dab5e4885207b12a0a7b (diff)
downloadmediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.tar.lz
mediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.tar.xz
mediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.zip
This commit was the work I did fixing errors that cropped up from the merge.
There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I cleared them up.
Diffstat (limited to 'mediagoblin/moderation/tools.py')
-rw-r--r--mediagoblin/moderation/tools.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py
index 25e5dc63..b4daca15 100644
--- a/mediagoblin/moderation/tools.py
+++ b/mediagoblin/moderation/tools.py
@@ -31,7 +31,8 @@ def take_punitive_actions(request, form, report, user):
# punitive actions that a moderator could take.
if u'takeaway' in form.action_to_resolve.data:
for privilege_name in form.take_away_privileges.data:
- privilege = Privilege.one({u'privilege_name':privilege_name})
+ privilege = Privilege.query.filter(
+ Privilege.privilege_name==privilege_name).one()
form.resolution_content.data += \
u"<br>%s took away %s\'s %s privileges" % (
request.user.username,