diff options
Diffstat (limited to 'mediagoblin/moderation')
| -rw-r--r-- | mediagoblin/moderation/tools.py | 3 | ||||
| -rw-r--r-- | mediagoblin/moderation/views.py | 8 |
2 files changed, 8 insertions, 3 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, diff --git a/mediagoblin/moderation/views.py b/mediagoblin/moderation/views.py index 67928927..041cf5b3 100644 --- a/mediagoblin/moderation/views.py +++ b/mediagoblin/moderation/views.py @@ -116,7 +116,10 @@ def moderation_reports_detail(request): form = moderation_forms.ReportResolutionForm(request.form) report = ReportBase.query.get(request.matchdict['report_id']) - form.take_away_privileges.choices = [(s.privilege_name,s.privilege_name.title()) for s in report.reported_user.all_privileges] + form.take_away_privileges.choices = [ + (s.privilege_name,s.privilege_name.title()) \ + for s in report.reported_user.all_privileges + ] if request.method == "POST" and form.validate(): user = User.query.get(form.targeted_user.data) @@ -139,7 +142,8 @@ def give_or_take_away_privilege(request, url_user): ''' form = moderation_forms.PrivilegeAddRemoveForm(request.form) if request.method == "POST" and form.validate(): - privilege = Privilege.one({'privilege_name':form.privilege_name.data}) + privilege = Privilege.query.filter( + Privilege.privilege_name==form.privilege_name.data).one() if privilege in url_user.all_privileges: url_user.all_privileges.remove(privilege) else: |