X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/174c53e97bcf1e5412c141829d152aa5a2b8684c..60cf509da831a2e81e2631ffc1150f81ed96fe4c:/forum/views/users.py diff --git a/forum/views/users.py b/forum/views/users.py index fbde095..ba9e173 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -7,22 +7,27 @@ from django.contrib.contenttypes.models import ContentType from django.core.urlresolvers import reverse from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext -from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect, Http404 +from django.http import HttpResponse, HttpResponseRedirect, Http404 +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 import simplejson -from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse, NoReverseMatch from forum.forms import * from forum.utils.html import sanitize_html +from forum.modules import decorate from datetime import datetime, date import decorators from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction +from forum.modules import ui import time +import decorators 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') @@ -54,43 +59,37 @@ def users(request): except (EmptyPage, InvalidPage): users = objects_list.page(objects_list.num_pages) - return render_to_response('users/users.html', { - "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 + return { + "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 + } } - }, context_instance=RequestContext(request)) - -def set_new_email(user, new_email, nomessage=False): - if new_email != user.email: - user.email = new_email - user.email_isvalid = False - user.save() - #if settings.EMAIL_VALIDATION == 'on': - # send_new_email_key(user,nomessage=nomessage) @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): - return HttpResponseForbidden() + return HttpResponseUnauthorized(request) if request.method == "POST": form = EditUserForm(user, request.POST) if form.is_valid(): new_email = sanitize_html(form.cleaned_data['email']) - set_new_email(user, new_email) + if new_email != user.email: + user.email = new_email + user.email_isvalid = False if settings.EDITABLE_SCREEN_NAME: user.username = sanitize_html(form.cleaned_data['username']) @@ -105,6 +104,7 @@ def edit_user(request, id): user.save() EditProfileAction(user=user, ip=request.META['REMOTE_ADDR']).save() + request.user.message_set.create(message=_("Profile updated.")) return HttpResponseRedirect(user.get_profile_url()) else: form = EditUserForm(user) @@ -118,7 +118,7 @@ def edit_user(request, id): @login_required def user_powers(request, id, action, status): if not request.user.is_superuser: - return HttpResponseForbidden() + return HttpResponseUnauthorized(request) user = get_object_or_404(User, id=id) new_state = action == 'grant' @@ -134,7 +134,7 @@ def user_powers(request, id, action, status): return HttpResponseRedirect(user.get_profile_url()) -@decorators.command +@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")) @@ -152,7 +152,7 @@ def award_points(request, id): return dict(reputation=user.reputation) -@decorators.command +@decorate.withfn(decorators.command) def suspend(request, id): user = get_object_or_404(User, id=id) @@ -184,31 +184,41 @@ def suspend(request, id): return decorators.RefreshPageCommand() -def user_view(template, tab_name, tab_description, page_title, private=False): +def user_view(template, tab_name, tab_title, tab_description, private=False, tabbed=True, weight=500): def decorator(fn): - def decorated(request, id, slug=None): + def decorated(fn, 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 HttpResponseForbidden() + return HttpResponseUnauthorized(request) context = fn(request, user) - rev_page_title = user.username + " - " + page_title + rev_page_title = user.username + " - " + tab_description context.update({ - "tab_name" : tab_name, + "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)) - return decorated + if tabbed: + def url_getter(vu): + try: + return reverse(fn.__name__, kwargs={'id': vu.id, 'slug': slugify(vu.username)}) + except NoReverseMatch: + 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 + )) + + return decorate.withfn(decorated)(fn) return decorator -@user_view('users/stats.html', 'stats', _('user profile'), _('user overview')) -def user_stats(request, user): +@user_view('users/stats.html', 'stats', _('overview'), _('user overview')) +def user_profile(request, user): 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') @@ -236,8 +246,8 @@ def user_stats(request, user): "awards": awards, "total_awards" : len(awards), } - -@user_view('users/recent.html', 'recent', _('recent user activity'), _('recent activity')) + +@user_view('users/recent.html', 'recent', _('recent activity'), _('recent user activity')) def user_recent(request, user): activities = user.actions.exclude( action_type__in=("voteup", "votedown", "voteupcomment", "flag", "newpage", "editpage")).order_by( @@ -246,15 +256,7 @@ def user_recent(request, user): return {"view_user" : user, "activities" : activities} -@user_view('users/votes.html', 'votes', _('user vote record'), _('votes'), True) -def user_votes(request, user): - 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/reputation.html', 'reputation', _('user reputation in the community'), _('user reputation')) +@user_view('users/reputation.html', 'reputation', _('karma history'), _('graph of user karma')) def user_reputation(request, user): rep = list(user.reputes.order_by('date')) values = [r.value for r in rep] @@ -269,13 +271,20 @@ def user_reputation(request, user): return {"view_user": user, "reputation": rep, "graph_data": graph_data} -@user_view('users/questions.html', 'favorites', _('favorite questions'), _('favorite questions')) +@user_view('users/votes.html', 'votes', _('votes'), _('user vote record'), True) +def user_votes(request, user): + 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): favorites = FavoriteAction.objects.filter(canceled=False, user=user) return {"favorites" : favorites, "view_user" : user} -@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True) +@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True, tabbed=False) def user_subscriptions(request, user): if request.method == 'POST': form = SubscriptionSettingsForm(request.POST)