X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/6885460495d38fd9954b21bf1933055b19ffa4bb..7395cbba715aeda5b5d0927f33d4949b05803865:/forum/views/users.py?ds=sidebyside diff --git a/forum/views/users.py b/forum/views/users.py index 3c1654c..50c295f 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 @@ -16,13 +15,15 @@ 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 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 @@ -69,21 +70,68 @@ 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', "") - one_hour_ago = datetime.datetime.now() - datetime.timedelta(hours=1) - sql_datetime = datetime.datetime.strftime(one_hour_ago, '%Y-%m-%d %H:%M:%S') - users = User.objects.order_by('-last_seen') + 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() - return pagination.paginated(request, ('users', UserListPaginatorContext()), { + 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): user = get_object_or_404(User, id=id) if not (request.user.is_superuser or request.user == user): @@ -189,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': @@ -211,10 +259,10 @@ 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], {} @@ -290,7 +338,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] @@ -403,13 +451,4 @@ def user_preferences(request, user): return {'view_user': user, 'form': form} -@login_required -def account_settings(request): - logging.debug('') - msg = request.GET.get('msg', '') - is_openid = False - return render_to_response('account_settings.html', { - 'msg': msg, - 'is_openid': is_openid - }, context_instance=RequestContext(request))