X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/62604660ed4357d8e2cb3e920751c3a7be8d4234..f1defc59ca7a7b15e17e8a59c72a726ae937d8e5:/forum/views/users.py diff --git a/forum/views/users.py b/forum/views/users.py index 1d12b4e..6686a26 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -11,11 +11,12 @@ 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 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction from forum.modules import ui @@ -23,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): @@ -70,7 +69,7 @@ def users(request): }) -@decorators.render('users/online_users.html', 'online_users', _('Online Users'), weight=200) +@decorators.render('users/online_users.html', 'online_users', _('Online Users'), weight=200, tabbed=False) def online_users(request): suser = request.REQUEST.get('q', "") @@ -259,17 +258,17 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab 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) + 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], {} decorated = decorate.params.withfn(params)(fn) def result(context, request, user): - rev_page_title = user.username + " - " + tab_description + rev_page_title = smart_unicode(user.username) + " - " + tab_description context.update({ "tab": "users", @@ -285,7 +284,7 @@ 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}) @@ -305,7 +304,7 @@ def user_profile(request, user): 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') @@ -314,7 +313,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, @@ -338,7 +337,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] @@ -368,7 +367,7 @@ def user_favorites(request, user): @user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False) def user_subscriptions(request, user): - enabled = user.subscription_settings.enable_notifications + enabled = True tab = request.GET.get('tab', "settings") @@ -382,14 +381,6 @@ def user_subscriptions(request, user): form.save() message = _('New subscription settings are now saved') - if 'notswitch' in request.POST: - enabled = not enabled - - if enabled: - message = _('Notifications are now enabled') - else: - message = _('Notifications are now disabled') - user.subscription_settings.enable_notifications = enabled user.subscription_settings.save()