X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/884e479eef090cc3e9e5ce102bcb839a14993efe..e5cc68e7511d5c57b88a7acab4119f3cef55b1ce:/forum/views/users.py diff --git a/forum/views/users.py b/forum/views/users.py index cf9b373..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): @@ -131,7 +131,7 @@ def online_users(request): }) -def edit_user(request, id): +def edit_user(request, id, slug): user = get_object_or_404(User, id=id) if not (request.user.is_superuser or request.user == user): return HttpResponseUnauthorized(request) @@ -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): @@ -305,7 +323,10 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab try: return reverse(fn.__name__, kwargs={'id': vu.id, 'slug': slugify(smart_unicode(vu.username))}) except NoReverseMatch: - return reverse(fn.__name__, kwargs={'id': vu.id}) + try: + return reverse(fn.__name__, kwargs={'id': vu.id}) + except NoReverseMatch: + return reverse(fn.__name__, kwargs={'slug': slugify(smart_unicode(vu.username))}) ui.register(ui.PROFILE_TABS, ui.ProfileTab( tab_name, tab_title, tab_description,url_getter, private, render_to, weight @@ -368,7 +389,7 @@ def user_reputation(request, user, **kwargs): redux = lambda x, y: x+y graph_data = simplejson.dumps([ - (time.mktime(rep[i].date.timetuple()) * 1000, reduce(redux, values[:i], 0)) + (time.mktime(rep[i].date.timetuple()) * 1000, reduce(redux, values[:i+1], 0)) for i in range(len(values)) ]) @@ -391,11 +412,33 @@ 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") - if tab == 'settings': + # Manage tab + if tab == 'manage': + manage_open = True + + auto = request.GET.get('auto', 'True') + if auto == 'True': + show_auto = True + subscriptions = QuestionSubscription.objects.filter(user=user).order_by('-last_view') + else: + show_auto = False + subscriptions = QuestionSubscription.objects.filter(user=user, auto_subscription=False).order_by('-last_view') + + return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), { + 'subscriptions':subscriptions, + 'view_user':user, + "auto":show_auto, + 'manage_open':manage_open, + }) + # Settings Tab and everything else + else: manage_open = False if request.method == 'POST': manage_open = False @@ -419,34 +462,6 @@ def user_subscriptions(request, user, **kwargs): 'manage_open':manage_open, } - elif tab == 'manage': - manage_open = True - - auto = request.GET.get('auto', 'True') - if auto == 'True': - show_auto = True - subscriptions = QuestionSubscription.objects.filter(user=user).order_by('-last_view') - else: - show_auto = False - subscriptions = QuestionSubscription.objects.filter(user=user, auto_subscription=False).order_by('-last_view') - - return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), { - 'subscriptions':subscriptions, - 'view_user':user, - "auto":show_auto, - 'manage_open':manage_open, - }) - - # else: - # todo: probably want to throw an error - # error = "error to throw" - - - - - - - @user_view('users/preferences.html', 'preferences', _('preferences'), _('preferences'), True, tabbed=False) def user_preferences(request, user, **kwargs): if request.POST: