X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/afa2b5ca9e29a5f2f3dfa8f94a5be2f9e612d719..e5cc68e7511d5c57b88a7acab4119f3cef55b1ce:/forum/views/users.py?ds=sidebyside

diff --git a/forum/views/users.py b/forum/views/users.py
index db65003..dc865a2 100644
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -18,7 +18,7 @@ from forum.forms import *
 from forum.utils.html import sanitize_html
 from forum.modules import decorate, ReturnImediatelyException
 from datetime import datetime, date
-from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction
+from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction, ReportAction
 from forum.modules import ui
 from forum.utils import pagination
 from forum.views.readers import QuestionListPaginatorContext, AnswerPaginatorContext
@@ -33,13 +33,13 @@ class UserReputationSort(pagination.SimpleSort):
         return objects.order_by('-is_active', self.order_by)
 
 class UserListPaginatorContext(pagination.PaginatorContext):
-    def __init__(self, pagesizes=(20, 35, 60)):
+    def __init__(self, pagesizes=(20, 35, 60), default_pagesize=35):
         super (UserListPaginatorContext, self).__init__('USERS_LIST', sort_methods=(
             (_('reputation'), UserReputationSort(_('reputation'), '-reputation', _("sorted by reputation"))),
             (_('newest'), pagination.SimpleSort(_('recent'), '-date_joined', _("newest members"))),
             (_('last'), pagination.SimpleSort(_('oldest'), 'date_joined', _("oldest members"))),
             (_('name'), pagination.SimpleSort(_('by username'), 'username', _("sorted by username"))),
-        ), pagesizes=pagesizes)
+        ), pagesizes=pagesizes, default_pagesize=default_pagesize)
 
 class SubscriptionListPaginatorContext(pagination.PaginatorContext):
     def __init__(self):
@@ -236,7 +236,7 @@ def suspend(request, id):
             return render_to_response('users/suspend_user.html')
 
     data = {
-        'bantype': request.POST.get('bantype', 'indefinetly').strip(),
+        'bantype': request.POST.get('bantype', 'Indefinitely').strip(),
         'publicmsg': request.POST.get('publicmsg', _('Bad behaviour')),
         'privatemsg': request.POST.get('privatemsg', None) or request.POST.get('publicmsg', ''),
         'suspended': user
@@ -252,6 +252,24 @@ def suspend(request, id):
 
     return decorators.RefreshPageCommand()
 
+@decorate.withfn(decorators.command)
+def report_user(request, id):
+    user = get_object_or_404(User, id=id)
+
+    if not request.POST.get('publicmsg', None):
+        return render_to_response('users/report_user.html')
+
+    data = {
+        'publicmsg': request.POST.get('publicmsg', _('N/A')),
+        'reported': user
+    }
+
+    ReportAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=data)
+
+
+    return decorators.RefreshPageCommand()
+
+
 
 def user_view(template, tab_name, tab_title, tab_description, private=False, tabbed=True, render_to=None, weight=500):
     def decorator(fn):
@@ -394,6 +412,9 @@ def user_favorites(request, user, **kwargs):
 
 @user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False)
 def user_subscriptions(request, user, **kwargs):
+    return _user_subscriptions(request, user, **kwargs)
+
+def _user_subscriptions(request, user, **kwargs):
     enabled = True
 
     tab = request.GET.get('tab', "settings")