X-Git-Url: https://git.openstreetmap.org/osqa.git/blobdiff_plain/162b4fd442c169a61d2f5b2b3bd613546c8472da..62604660ed4357d8e2cb3e920751c3a7be8d4234:/forum/views/users.py diff --git a/forum/views/users.py b/forum/views/users.py index 9cac193..1d12b4e 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 @@ -18,13 +17,17 @@ 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 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): @@ -39,6 +42,18 @@ class UserListPaginatorContext(pagination.PaginatorContext): (_('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) @@ -46,16 +61,77 @@ 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, }) -@login_required +@decorators.render('users/online_users.html', 'online_users', _('Online Users'), weight=200) +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, + }) + + def edit_user(request, id): user = get_object_or_404(User, id=id) if not (request.user.is_superuser or request.user == user): @@ -69,6 +145,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 +237,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', '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': @@ -174,27 +256,32 @@ 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 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) if render_to and (not render_to(user)): return HttpResponseRedirect(user.get_profile_url()) - - context = fn(request, user) + return [request, user], {} + + decorated = decorate.params.withfn(params)(fn) + + def result(context, request, user): rev_page_title = user.username + " - " + tab_description context.update({ - "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 + "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: @@ -206,7 +293,7 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab tab_name, tab_title, tab_description,url_getter, private, render_to, weight )) - return decorate.withfn(decorated)(fn) + return decorated return decorator @@ -226,7 +313,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, @@ -238,7 +327,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): @@ -277,42 +366,89 @@ 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): enabled = user.subscription_settings.enable_notifications - if request.method == 'POST': - form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings) + tab = request.GET.get('tab', "settings") - if form.is_valid(): - form.save() - message = _('New subscription settings are now saved') + if tab == 'settings': + manage_open = False + if request.method == 'POST': + manage_open = False + form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings) - if 'notswitch' in request.POST: - enabled = not enabled + if form.is_valid(): + form.save() + message = _('New subscription settings are now saved') - if enabled: - message = _('Notifications are now enabled') - else: - message = _('Notifications are now disabled') + if 'notswitch' in request.POST: + enabled = not enabled - user.subscription_settings.enable_notifications = enabled - user.subscription_settings.save() + if enabled: + message = _('Notifications are now enabled') + else: + message = _('Notifications are now disabled') - 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, + '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 {'view_user':user, 'notificatons_on': enabled, 'form':form} + return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), { + 'subscriptions':subscriptions, + 'view_user':user, + "auto":show_auto, + 'manage_open':manage_open, + }) -@login_required -def account_settings(request): - logging.debug('') - msg = request.GET.get('msg', '') - is_openid = False + # 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))