X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/720f7b0224eebb2c6ab92c5bf83fbddbf82720b3..554564294a9a644a3a6723c386f5eb009e23ce98:/forum/views/users.py?ds=inline diff --git a/forum/views/users.py b/forum/views/users.py index ba9e173..8766851 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -1,4 +1,3 @@ -from django.contrib.auth.decorators import login_required from forum.models import User from django.db.models import Q, Count from django.core.paginator import Paginator, EmptyPage, InvalidPage @@ -12,72 +11,128 @@ from forum.http_responses import HttpResponseUnauthorized from django.utils.translation import ugettext as _ from django.utils.http import urlquote_plus from django.utils.html import strip_tags +from django.utils.encoding import smart_unicode from django.utils import simplejson from django.core.urlresolvers import reverse, NoReverseMatch from forum.forms import * from forum.utils.html import sanitize_html -from forum.modules import decorate +from forum.modules import decorate, ReturnImediatelyException 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 +from forum.settings import ONLINE_USERS + +import bisect import time +import datetime import decorators +import unicodedata + +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 SubscriptionListPaginatorContext(pagination.PaginatorContext): + def __init__(self): + super (SubscriptionListPaginatorContext, self).__init__('SUBSCRIPTION_LIST', pagesizes=(5, 10, 20), default_pagesize=20) + +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 - } - } + }) + + +@decorators.render('users/online_users.html', 'online_users', _('Online Users'), weight=200, tabbed=False) +def online_users(request): + suser = request.REQUEST.get('q', "") + + sort = "" + if request.GET.get("sort", None): + try: + sort = int(request.GET["sort"]) + except ValueError: + logging.error('Found invalid sort "%s", loading %s, refered by %s' % ( + request.GET.get("sort", ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN') + )) + raise Http404() + + page = 0 + if request.GET.get("page", None): + try: + page = int(request.GET["page"]) + except ValueError: + logging.error('Found invalid page "%s", loading %s, refered by %s' % ( + request.GET.get("page", ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN') + )) + raise Http404() + + pagesize = 10 + if request.GET.get("pagesize", None): + try: + pagesize = int(request.GET["pagesize"]) + except ValueError: + logging.error('Found invalid pagesize "%s", loading %s, refered by %s' % ( + request.GET.get("pagesize", ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN') + )) + raise Http404() + + + users = None + if sort == "reputation": + users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.reputation) + elif sort == "newest" : + users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.newest) + elif sort == "last": + users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.last) + elif sort == "name": + users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.name) + elif sort == "oldest": + users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.oldest) + elif sort == "newest": + users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.newest) + elif sort == "votes": + users = sorted(ONLINE_USERS.sets.keys(), key=lambda user: user.votes) + else: + users = sorted(ONLINE_USERS.iteritems(), key=lambda x: x[1]) + + return render_to_response('users/online_users.html', { + "users" : users, + "suser" : suser, + "sort" : sort, + "page" : page, + "pageSize" : pagesize, + }) -@login_required def edit_user(request, id): user = get_object_or_404(User, id=id) if not (request.user.is_superuser or request.user == user): @@ -91,6 +146,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 +176,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,47 +195,53 @@ 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=user, extra=extra).save(data=dict(value=points)) - - return dict(reputation=user.reputation) + BonusRepAction(user=request.user, extra=extra).save(data=dict(value=points, affected=user)) + return {'commands': { + 'update_profile_karma': [user.reputation] + }} + @decorate.withfn(decorators.command) def suspend(request, id): user = get_object_or_404(User, id=id) - if not request.POST: + if not request.user.is_superuser: + raise decorators.CommandException(_("Only superusers can suspend other users")) + + if not request.POST.get('bantype', None): if user.is_suspended(): suspension = user.suspension - suspension.cancel(ip=request.META['REMOTE_ADDR']) + suspension.cancel(user=request.user, ip=request.META['REMOTE_ADDR']) return decorators.RefreshPageCommand() else: return render_to_response('users/suspend_user.html') - if not request.user.is_superuser: - raise decorators.CommandException(_("Only superusers can ban other users")) - data = { - 'bantype': request.POST.get('bantype', 'indefinetly').strip(), - 'publicmsg': request.POST.get('publicmsg', _('Bad behaviour')), - 'privatemsg': request.POST.get('privatemsg', None) or request.POST.get('publicmsg', ''), - 'suspender': request.user.id + 'bantype': request.POST.get('bantype', 'indefinetly').strip(), + 'publicmsg': request.POST.get('publicmsg', _('Bad behaviour')), + 'privatemsg': request.POST.get('privatemsg', None) or request.POST.get('publicmsg', ''), + 'suspended': user } if data['bantype'] == 'forxdays': @@ -180,28 +250,39 @@ def suspend(request, id): except: raise decorators.CommandException(_('Invalid numeric argument for the number of days.')) - SuspendAction(user=user, ip=request.META['REMOTE_ADDR']).save(data=data) + SuspendAction(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, weight=500): + +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) + raise ReturnImediatelyException(HttpResponseUnauthorized(request)) + + if render_to and (not render_to(user)): + raise ReturnImediatelyException(HttpResponseRedirect(user.get_profile_url())) + + return [request, user], {} - rev_page_title = user.username + " - " + tab_description + decorated = decorate.params.withfn(params)(fn) + + def result(context, request, user): + rev_page_title = smart_unicode(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: @@ -210,10 +291,10 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab return reverse(fn.__name__, kwargs={'id': vu.id}) ui.register(ui.PROFILE_TABS, ui.ProfileTab( - tab_name, tab_title, tab_description,url_getter, private, weight + tab_name, tab_title, tab_description,url_getter, private, render_to, weight )) - return decorate.withfn(decorated)(fn) + return decorated return decorator @@ -233,7 +314,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, @@ -245,7 +328,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): @@ -256,7 +339,7 @@ def user_recent(request, user): return {"view_user" : user, "activities" : activities} -@user_view('users/reputation.html', 'reputation', _('karma history'), _('graph of user karma')) +@user_view('users/reputation.html', 'reputation', _('reputation history'), _('graph of user karma')) def user_reputation(request, user): rep = list(user.reputes.order_by('date')) values = [r.value for r in rep] @@ -284,41 +367,81 @@ def user_favorites(request, user): return {"favorites" : favorites, "view_user" : user} -@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True, tabbed=False) +@user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False) def user_subscriptions(request, user): - if request.method == 'POST': - form = SubscriptionSettingsForm(request.POST) + enabled = True - if 'notswitch' in request.POST: - user.subscription_settings.enable_notifications = not user.subscription_settings.enable_notifications - user.subscription_settings.save() + tab = request.GET.get('tab', "settings") - if user.subscription_settings.enable_notifications: - request.user.message_set.create(message=_('Notifications are now enabled')) - else: - request.user.message_set.create(message=_('Notifications are now disabled')) + if tab == 'settings': + manage_open = False + if request.method == 'POST': + manage_open = False + form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings) - form.is_valid() - for k, v in form.cleaned_data.items(): - setattr(user.subscription_settings, k, v) + if form.is_valid(): + form.save() + message = _('New subscription settings are now saved') - user.subscription_settings.save() - request.user.message_set.create(message=_('New subscription settings are now saved')) - else: - form = SubscriptionSettingsForm(user.subscription_settings.__dict__) + user.subscription_settings.enable_notifications = enabled + user.subscription_settings.save() - notificatons_on = user.subscription_settings.enable_notifications + request.user.message_set.create(message=message) + else: + form = SubscriptionSettingsForm(instance=user.subscription_settings) - return {'view_user':user, 'notificatons_on': notificatons_on, 'form':form} + return { + 'view_user':user, + 'notificatons_on': enabled, + 'form':form, + 'manage_open':manage_open, + } -@login_required -def account_settings(request): - logging.debug('') - msg = request.GET.get('msg', '') - is_openid = False + 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): + 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 + + if preferences: + form = UserPreferencesForm(initial=preferences) + else: + form = UserPreferencesForm() + + return {'view_user': user, 'form': form} - return render_to_response('account_settings.html', { - 'msg': msg, - 'is_openid': is_openid - }, context_instance=RequestContext(request))