X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/ad213fc7d53a172c05cc2733c4320f6a1bb711be..0df1608e9f603e6f40b306a3aff20e52e7318d5a:/forum/views/users.py diff --git a/forum/views/users.py b/forum/views/users.py index e6abdc4..df38159 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -24,24 +24,22 @@ 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): + def __init__(self, pagesizes=(20, 35, 60)): 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) class SubscriptionListPaginatorContext(pagination.PaginatorContext): def __init__(self): @@ -133,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) @@ -238,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 @@ -257,21 +255,40 @@ 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): raise ReturnImediatelyException(HttpResponseUnauthorized(request)) if render_to and (not render_to(user)): 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): + 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", "active_tab" : tab_name, @@ -288,7 +305,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 @@ -299,10 +319,15 @@ 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() @@ -315,7 +340,7 @@ def user_profile(request, user): Badge.objects.filter(awards__user=user).values('id').annotate(count=Count('cls')).order_by('-count')] return pagination.paginated(request, ( - ('questions', QuestionListPaginatorContext('USER_QUESTION_LIST', _('questions'), 15)), + ('questions', QuestionListPaginatorContext('USER_QUESTION_LIST', _('questions'), default_pagesize=15)), ('answers', UserAnswersPaginatorContext())), { "view_user" : user, "questions" : questions, @@ -331,7 +356,7 @@ def user_profile(request, user): }) @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] @@ -340,13 +365,13 @@ def user_recent(request, user): @user_view('users/reputation.html', 'reputation', _('reputation history'), _('graph of user karma')) -def user_reputation(request, user): +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)) ]) @@ -355,25 +380,44 @@ 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'), _('subscriptions'), True, tabbed=False) -def user_subscriptions(request, user): +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 @@ -397,36 +441,8 @@ def user_subscriptions(request, user): '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): +def user_preferences(request, user, **kwargs): if request.POST: form = UserPreferencesForm(request.POST)