X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/ece2ce09e485f83207994f83cac03ef9f36da5b2..700b6dec7e4d655fee91e26f9757442162047281:/forum/views/users.py?ds=sidebyside diff --git a/forum/views/users.py b/forum/views/users.py index 43464d8..306747a 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -21,60 +21,47 @@ from datetime import datetime, date import decorators from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction from forum.modules import ui +from forum.utils import pagination +from forum.views.readers import QuestionListPaginatorContext, AnswerPaginatorContext import time import decorators +class UserReputationSort(pagination.SimpleSort): + def apply(self, objects): + return objects.order_by('-is_active', self.order_by) + +class UserListPaginatorContext(pagination.PaginatorContext): + def __init__(self): + 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=(20, 35, 60)) + +class UserAnswersPaginatorContext(pagination.PaginatorContext): + def __init__(self): + super (UserAnswersPaginatorContext, self).__init__('USER_ANSWER_LIST', sort_methods=( + (_('oldest'), pagination.SimpleSort(_('oldest answers'), 'added_at', _("oldest answers will be shown first"))), + (_('newest'), pagination.SimpleSort(_('newest answers'), '-added_at', _("newest answers will be shown first"))), + (_('votes'), pagination.SimpleSort(_('popular answers'), '-score', _("most voted answers will be shown first"))), + ), default_sort=_('votes'), pagesizes=(5, 10, 20), default_pagesize=20, prefix=_('answers')) + USERS_PAGE_SIZE = 35# refactor - move to some constants file @decorators.render('users/users.html', 'users', _('users'), weight=200) def users(request): - is_paginated = True - sortby = request.GET.get('sort', 'reputation') suser = request.REQUEST.get('q', "") - try: - page = int(request.GET.get('page', '1')) - except ValueError: - page = 1 - - if suser == "": - if sortby == "newest": - objects_list = Paginator(User.objects.all().order_by('-date_joined'), USERS_PAGE_SIZE) - elif sortby == "last": - objects_list = Paginator(User.objects.all().order_by('date_joined'), USERS_PAGE_SIZE) - elif sortby == "user": - objects_list = Paginator(User.objects.all().order_by('username'), USERS_PAGE_SIZE) - # default - else: - objects_list = Paginator(User.objects.all().order_by('-is_active', '-reputation'), USERS_PAGE_SIZE) - base_url = reverse('users') + '?sort=%s&' % sortby - else: - sortby = "reputation" - objects_list = Paginator(User.objects.filter(username__icontains=suser).order_by('-reputation'), USERS_PAGE_SIZE - ) - base_url = reverse('users') + '?name=%s&sort=%s&' % (suser, sortby) + users = User.objects.all() - try: - users = objects_list.page(page) - except (EmptyPage, InvalidPage): - users = objects_list.page(objects_list.num_pages) + if suser != "": + users = users.filter(username__icontains=suser) - return { + return pagination.paginated(request, ('users', UserListPaginatorContext()), { "users" : users, "suser" : suser, - "keywords" : suser, - "tab_id" : sortby, - "context" : { - 'is_paginated' : is_paginated, - 'pages': objects_list.num_pages, - 'page': page, - 'has_previous': users.has_previous(), - 'has_next': users.has_next(), - 'previous': users.previous_page_number(), - 'next': users.next_page_number(), - 'base_url' : base_url - } - } + }) @login_required @@ -91,6 +78,12 @@ def edit_user(request, id): user.email = new_email user.email_isvalid = False + try: + hash = ValidationHash.objects.get(user=request.user, type='email') + hash.delete() + except: + pass + if settings.EDITABLE_SCREEN_NAME: user.username = sanitize_html(form.cleaned_data['username']) user.real_name = sanitize_html(form.cleaned_data['realname']) @@ -115,10 +108,13 @@ def edit_user(request, id): }, context_instance=RequestContext(request)) -@login_required +@decorate.withfn(decorators.command) def user_powers(request, id, action, status): if not request.user.is_superuser: - return HttpResponseUnauthorized(request) + raise decorators.CommandException(_("Only superusers are allowed to alter other users permissions.")) + + if (action == 'remove' and 'status' == 'super') and not request.user.is_siteowner(): + raise decorators.CommandException(_("Only the site owner can remove the super user status from other user.")) user = get_object_or_404(User, id=id) new_state = action == 'grant' @@ -131,26 +127,32 @@ def user_powers(request, id, action, status): raise Http404() user.save() - return HttpResponseRedirect(user.get_profile_url()) + return decorators.RefreshPageCommand() @decorate.withfn(decorators.command) def award_points(request, id): - if (not request.POST) and request.POST.get('points', None): - raise decorators.CommandException(_("Invalid request type")) + if not request.POST: + return render_to_response('users/karma_bonus.html') if not request.user.is_superuser: raise decorators.CommandException(_("Only superusers are allowed to award reputation points")) + try: + points = int(request.POST['points']) + except: + raise decorators.CommandException(_("Invalid number of points to award.")) + user = get_object_or_404(User, id=id) - points = int(request.POST['points']) extra = dict(message=request.POST.get('message', ''), awarding_user=request.user.id, value=points) BonusRepAction(user=request.user, extra=extra).save(data=dict(value=points, affected=user)) - return dict(reputation=user.reputation) - + return {'commands': { + 'update_profile_karma': [user.reputation] + }} + @decorate.withfn(decorators.command) def suspend(request, id): @@ -159,7 +161,7 @@ def suspend(request, id): if not request.user.is_superuser: raise decorators.CommandException(_("Only superusers can suspend other users")) - if not request.POST: + if not request.POST.get('bantype', None): if user.is_suspended(): suspension = user.suspension suspension.cancel(user=request.user, ip=request.META['REMOTE_ADDR']) @@ -187,22 +189,32 @@ def suspend(request, id): def user_view(template, tab_name, tab_title, tab_description, private=False, tabbed=True, render_to=None, weight=500): def decorator(fn): - def decorated(fn, request, id, slug=None): + def params(request, id, slug=None): user = get_object_or_404(User, id=id) if private and not (user == request.user or request.user.is_superuser): return HttpResponseUnauthorized(request) - context = fn(request, user) + if render_to and (not render_to(user)): + return HttpResponseRedirect(user.get_profile_url()) + + return [request, user], {} + + decorated = decorate.params.withfn(params)(fn) + + def result(context, request, user): rev_page_title = user.username + " - " + tab_description context.update({ - "active_tab" : tab_name, - "tab_description" : tab_description, - "page_title" : rev_page_title, - "can_view_private": (user == request.user) or request.user.is_superuser + "tab": "users", + "active_tab" : tab_name, + "tab_description" : tab_description, + "page_title" : rev_page_title, + "can_view_private": (user == request.user) or request.user.is_superuser }) return render_to_response(template, context, context_instance=RequestContext(request)) + decorated = decorate.result.withfn(result, needs_params=True)(decorated) + if tabbed: def url_getter(vu): try: @@ -214,7 +226,7 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab tab_name, tab_title, tab_description,url_getter, private, render_to, weight )) - return decorate.withfn(decorated)(fn) + return decorated return decorator @@ -234,7 +246,9 @@ def user_profile(request, user): awards = [(Badge.objects.get(id=b['id']), b['count']) for b in Badge.objects.filter(awards__user=user).values('id').annotate(count=Count('cls')).order_by('-count')] - return { + return pagination.paginated(request, ( + ('questions', QuestionListPaginatorContext('USER_QUESTION_LIST', _('questions'), 15)), + ('answers', UserAnswersPaginatorContext())), { "view_user" : user, "questions" : questions, "answers" : answers, @@ -246,7 +260,7 @@ def user_profile(request, user): "user_tags" : user_tags[:50], "awards": awards, "total_awards" : len(awards), - } + }) @user_view('users/recent.html', 'recent', _('recent activity'), _('recent user activity')) def user_recent(request, user): @@ -287,30 +301,50 @@ def user_favorites(request, user): @user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True, tabbed=False) def user_subscriptions(request, user): + enabled = user.subscription_settings.enable_notifications + if request.method == 'POST': form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings) if form.is_valid(): - if form.cleaned_data['user'] != user.id: - return HttpResponseUnauthorized(request) + form.save() + message = _('New subscription settings are now saved') if 'notswitch' in request.POST: - user.subscription_settings.enable_notifications = not user.subscription_settings.enable_notifications - user.subscription_settings.save() + enabled = not enabled - if user.subscription_settings.enable_notifications: - request.user.message_set.create(message=_('Notifications are now enabled')) + if enabled: + message = _('Notifications are now enabled') else: - request.user.message_set.create(message=_('Notifications are now disabled')) + message = _('Notifications are now disabled') - form.save() - request.user.message_set.create(message=_('New subscription settings are now saved')) + user.subscription_settings.enable_notifications = enabled + user.subscription_settings.save() + + request.user.message_set.create(message=message) else: form = SubscriptionSettingsForm(instance=user.subscription_settings) - notificatons_on = user.subscription_settings.enable_notifications + return {'view_user':user, 'notificatons_on': enabled, 'form':form} + +@user_view('users/preferences.html', 'preferences', _('preferences'), _('preferences'), True, tabbed=False) +def user_preferences(request, user): + if request.POST: + form = UserPreferencesForm(request.POST) + + if form.is_valid(): + user.prop.preferences = form.cleaned_data + request.user.message_set.create(message=_('New preferences saved')) + + else: + preferences = user.prop.preferences - return {'view_user':user, 'notificatons_on': notificatons_on, 'form':form} + if preferences: + form = UserPreferencesForm(initial=preferences) + else: + form = UserPreferencesForm() + + return {'view_user': user, 'form': form} @login_required def account_settings(request):