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, 3 insertions, 8 deletions
diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py index 224a0c73..f519e5f3 100644 --- a/mediagoblin/moderation/tools.py +++ b/mediagoblin/moderation/tools.py @@ -21,7 +21,6 @@ from mediagoblin.tools.mail import send_email from mediagoblin.tools.response import redirect from datetime import datetime from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ -import sys, traceback def take_punitive_actions(request, form, report, user): message_body ='' @@ -32,7 +31,7 @@ def take_punitive_actions(request, form, report, user): for privilege_name in form.take_away_privileges.data: take_away_privileges(user.username, privilege_name) form.resolution_content.data += \ - u"\n{mod} took away {user}\'{privilege} privileges.".format( + u"\n{mod} took away {user}\'s {privilege} privileges.".format( mod=request.user.username, user=user.username, privilege=privilege_name) diff --git a/mediagoblin/moderation/views.py b/mediagoblin/moderation/views.py index 4721834a..f4de11ad 100644 --- a/mediagoblin/moderation/views.py +++ b/mediagoblin/moderation/views.py @@ -14,12 +14,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from werkzeug.exceptions import Forbidden -from mediagoblin.db.models import (MediaEntry, User, MediaComment, \ - CommentReport, ReportBase, Privilege, \ +from mediagoblin.db.models import (MediaEntry, User,ReportBase, Privilege, UserBan) -from mediagoblin.decorators import (require_admin_or_moderator_login, +from mediagoblin.decorators import (require_admin_or_moderator_login, active_user_from_url, user_has_privilege, allow_reporting) from mediagoblin.tools.response import render_to_response, redirect @@ -27,8 +25,6 @@ from mediagoblin.moderation import forms as moderation_forms from mediagoblin.moderation.tools import (take_punitive_actions, \ take_away_privileges, give_privileges, ban_user, unban_user, \ parse_report_panel_settings) -from werkzeug.datastructures import ImmutableMultiDict -from datetime import datetime from math import ceil @require_admin_or_moderator_login |