X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f589e41b46ab266706a7f82a5562f50805359b26..7deaf42044d82ea939afa0b72b67c1e8877925c8:/forum/views/users.py diff --git a/forum/views/users.py b/forum/views/users.py index fa57542..84f1cdf 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,18 +11,21 @@ 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 time +import datetime import decorators class UserReputationSort(pagination.SimpleSort): @@ -31,13 +33,25 @@ class UserReputationSort(pagination.SimpleSort): return objects.order_by('-is_active', self.order_by) class UserListPaginatorContext(pagination.PaginatorContext): - def __init__(self): + 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=(20, 35, 60)) + ), pagesizes=pagesizes, default_pagesize=default_pagesize) + +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 @@ -46,17 +60,78 @@ def users(request): suser = request.REQUEST.get('q', "") users = User.objects.all() - if suser == "": + if suser != "": users = users.filter(username__icontains=suser) - return pagination.paginated(request, 'users', UserListPaginatorContext(), { + return pagination.paginated(request, ('users', UserListPaginatorContext()), { + "users" : users, + "suser" : suser, + }) + + +@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): +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) @@ -69,6 +144,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']) @@ -155,10 +236,10 @@ def suspend(request, id): return render_to_response('users/suspend_user.html') 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', ''), - 'suspended': user + '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 } if data['bantype'] == 'forxdays': @@ -174,20 +255,39 @@ 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 params(request, id, slug=None): - user = get_object_or_404(User, id=id) + def params(request, id=None, slug=None): + # Get the user object by id if the id parameter has been passed + if id is not None: + user = get_object_or_404(User, id=id) + # ...or by slug if the slug has been given + elif slug is not None: + try: + user = User.objects.get(username__iexact=slug) + except User.DoesNotExist: + raise Http404 + if private and not (user == request.user or request.user.is_superuser): - return HttpResponseUnauthorized(request) + raise ReturnImediatelyException(HttpResponseUnauthorized(request)) if render_to and (not render_to(user)): - return HttpResponseRedirect(user.get_profile_url()) + raise ReturnImediatelyException(HttpResponseRedirect(user.get_profile_url())) - return [request, user], {} + return [request, user], { 'slug' : slug, } decorated = decorate.params.withfn(params)(fn) - def result(context, request, user): - rev_page_title = user.username + " - " + tab_description + def result(context_or_response, request, user, **kwargs): + rev_page_title = smart_unicode(user.username) + " - " + tab_description + + # Check whether the return type of the decorated function is a context or Http Response + if isinstance(context_or_response, HttpResponse): + response = context_or_response + + # If it is a response -- show it + return response + else: + # ...if it is a context move forward, update it and render it to response + context = context_or_response context.update({ "tab": "users", @@ -203,9 +303,12 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab if tabbed: def url_getter(vu): try: - return reverse(fn.__name__, kwargs={'id': vu.id, 'slug': slugify(vu.username)}) + 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 @@ -216,14 +319,19 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab @user_view('users/stats.html', 'stats', _('overview'), _('user overview')) -def user_profile(request, user): +def user_profile(request, user, **kwargs): questions = Question.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at') answers = Answer.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at') + # Check whether the passed slug matches the one for the user object + slug = kwargs['slug'] + if slug != slugify(smart_unicode(user.username)): + return HttpResponseRedirect(user.get_absolute_url()) + up_votes = user.vote_up_count down_votes = user.vote_down_count votes_today = user.get_vote_count_today() - votes_total = int(settings.MAX_VOTES_PER_DAY) + votes_total = user.can_vote_count_today() user_tags = Tag.objects.filter(Q(nodes__author=user) | Q(nodes__children__author=user)) \ .annotate(user_tag_usage_count=Count('name')).order_by('-user_tag_usage_count') @@ -231,7 +339,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'), default_pagesize=15)), + ('answers', UserAnswersPaginatorContext())), { "view_user" : user, "questions" : questions, "answers" : answers, @@ -243,10 +353,10 @@ 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): +def user_recent(request, user, **kwargs): activities = user.actions.exclude( action_type__in=("voteup", "votedown", "voteupcomment", "flag", "newpage", "editpage")).order_by( '-action_date')[:USERS_PAGE_SIZE] @@ -254,14 +364,14 @@ def user_recent(request, user): return {"view_user" : user, "activities" : activities} -@user_view('users/reputation.html', 'reputation', _('karma history'), _('graph of user karma')) -def user_reputation(request, user): +@user_view('users/reputation.html', 'reputation', _('reputation history'), _('graph of user karma')) +def user_reputation(request, user, **kwargs): rep = list(user.reputes.order_by('date')) values = [r.value for r in rep] 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)) ]) @@ -270,54 +380,87 @@ def user_reputation(request, user): return {"view_user": user, "reputation": rep, "graph_data": graph_data} @user_view('users/votes.html', 'votes', _('votes'), _('user vote record'), True) -def user_votes(request, user): +def user_votes(request, user, **kwargs): votes = user.votes.exclude(node__state_string__contains="(deleted").filter( node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE] return {"view_user" : user, "votes" : votes} @user_view('users/questions.html', 'favorites', _('favorites'), _('questions that user selected as his/her favorite')) -def user_favorites(request, user): +def user_favorites(request, user, **kwargs): favorites = FavoriteAction.objects.filter(canceled=False, user=user) return {"favorites" : favorites, "view_user" : user} -@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True, tabbed=False) -def user_subscriptions(request, user): - enabled = user.subscription_settings.enable_notifications +@user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False) +def user_subscriptions(request, user, **kwargs): + return _user_subscriptions(request, user, **kwargs) - if request.method == 'POST': - form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings) +def _user_subscriptions(request, user, **kwargs): + enabled = True - if form.is_valid(): - form.save() - message = _('New subscription settings are now saved') + tab = request.GET.get('tab', "settings") - if 'notswitch' in request.POST: - enabled = not enabled + # Manage tab + if tab == 'manage': + manage_open = True - if enabled: - message = _('Notifications are now enabled') - else: - message = _('Notifications are now disabled') + 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 + form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings) - user.subscription_settings.enable_notifications = enabled - user.subscription_settings.save() + if form.is_valid(): + form.save() + message = _('New subscription settings are now saved') - request.user.message_set.create(message=message) - else: - form = SubscriptionSettingsForm(instance=user.subscription_settings) + user.subscription_settings.enable_notifications = enabled + user.subscription_settings.save() + + request.user.message_set.create(message=message) + else: + form = SubscriptionSettingsForm(instance=user.subscription_settings) - return {'view_user':user, 'notificatons_on': enabled, '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 +@user_view('users/preferences.html', 'preferences', _('preferences'), _('preferences'), True, tabbed=False) +def user_preferences(request, user, **kwargs): + 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))