From d88fcb03e2e520da6a7d0203d660e4536108f56b Mon Sep 17 00:00:00 2001 From: Jessica Tallon Date: Fri, 17 Jul 2015 17:51:51 +0200 Subject: Change codebase to query or create correct User model The code base had many references to User.username and other specific to LocalUser attributes as that was the way it use to exist. This updates those to query on the generic User model but filtering by attributes on the LocalUser. --- mediagoblin/moderation/tools.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mediagoblin/moderation/tools.py') diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py index 0bcd8762..56ef9449 100644 --- a/mediagoblin/moderation/tools.py +++ b/mediagoblin/moderation/tools.py @@ -17,7 +17,7 @@ import six from mediagoblin import mg_globals -from mediagoblin.db.models import User, Privilege, UserBan +from mediagoblin.db.models import User, Privilege, UserBan, LocalUser from mediagoblin.db.base import Session from mediagoblin.tools.mail import send_email from mediagoblin.tools.response import redirect @@ -123,7 +123,8 @@ def take_away_privileges(user,*privileges): privilege = Privilege.query.filter( Privilege.privilege_name==privileges[0]).first() user = User.query.filter( - User.username==user).first() + LocalUser.username==user + ).first() if privilege in user.all_privileges: user.all_privileges.remove(privilege) return True @@ -155,7 +156,8 @@ def give_privileges(user,*privileges): privilege = Privilege.query.filter( Privilege.privilege_name==privileges[0]).first() user = User.query.filter( - User.username==user).first() + LoclUser.username==user + ).first() if privilege not in user.all_privileges: user.all_privileges.append(privilege) return True -- cgit v1.2.3