Browse Source

Tweaks in warnings

Rafał Pitoń 10 years ago
parent
commit
968580cfee
2 changed files with 3 additions and 1 deletions
  1. 1 1
      misago/users/views/moderation.py
  2. 2 0
      misago/users/warnings.py

+ 1 - 1
misago/users/views/moderation.py

@@ -152,7 +152,7 @@ def rename(request, user):
         form = ChangeUsernameForm(request.POST, user=user)
         form = ChangeUsernameForm(request.POST, user=user)
         if form.is_valid():
         if form.is_valid():
             try:
             try:
-                form.change_username(changed_by=user)
+                form.change_username(changed_by=request.user)
                 message = _("%(old_username)s's username has been changed.")
                 message = _("%(old_username)s's username has been changed.")
                 message = message % {'old_username': old_username}
                 message = message % {'old_username': old_username}
                 messages.success(request, message)
                 messages.success(request, message)

+ 2 - 0
misago/users/warnings.py

@@ -36,6 +36,8 @@ def fetch_user_valid_warnings(user):
                     level_warnings.append(warning)
                     level_warnings.append(warning)
             if len(level_warnings) == length:
             if len(level_warnings) == length:
                 active_warnings = level_warnings[:length]
                 active_warnings = level_warnings[:length]
+            else:
+                break
         else:
         else:
             active_warnings = warnings[:length]
             active_warnings = warnings[:length]
     return active_warnings
     return active_warnings