X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/6c509614cfd11487a168cd31ee218502f9bd09a2..204b196b015876b87379c526b3f92e7e396464bd:/forum/views/users.py?ds=sidebyside diff --git a/forum/views/users.py b/forum/views/users.py index 2bda263..3c1654c 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -18,63 +18,69 @@ 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 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): + 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)) + +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) def users(request): - is_paginated = True - sortby = request.GET.get('sort', 'reputation') suser = request.REQUEST.get('q', "") - try: - page = int(request.GET.get('page', '1')) - except ValueError: - page = 1 - - if suser == "": - if sortby == "newest": - objects_list = Paginator(User.objects.all().order_by('-date_joined'), USERS_PAGE_SIZE) - elif sortby == "last": - objects_list = Paginator(User.objects.all().order_by('date_joined'), USERS_PAGE_SIZE) - elif sortby == "user": - objects_list = Paginator(User.objects.all().order_by('username'), USERS_PAGE_SIZE) - # default - else: - objects_list = Paginator(User.objects.all().order_by('-is_active', '-reputation'), USERS_PAGE_SIZE) - base_url = reverse('users') + '?sort=%s&' % sortby - else: - sortby = "reputation" - objects_list = Paginator(User.objects.filter(username__icontains=suser).order_by('-reputation'), USERS_PAGE_SIZE - ) - base_url = reverse('users') + '?name=%s&sort=%s&' % (suser, sortby) + users = User.objects.all() - try: - users = objects_list.page(page) - except (EmptyPage, InvalidPage): - users = objects_list.page(objects_list.num_pages) + if suser != "": + users = users.filter(username__icontains=suser) - return { + return pagination.paginated(request, ('users', UserListPaginatorContext()), { "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 - } - } + }) + + +#@decorators.render('users/online_users.html', 'online_users', _('Online Users'), weight=200) +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') + + return pagination.paginated(request, ('users', UserListPaginatorContext()), { + "users" : users, + "suser" : suser, + }) @login_required @@ -91,6 +97,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']) @@ -196,27 +208,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: @@ -228,7 +245,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 @@ -248,7 +265,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, @@ -260,7 +279,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): @@ -299,33 +318,90 @@ 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') + + 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 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): + 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')) - request.user.message_set.create(message=message) else: - form = SubscriptionSettingsForm(instance=user.subscription_settings) + preferences = user.prop.preferences - return {'view_user':user, 'notificatons_on': enabled, 'form':form} + if preferences: + form = UserPreferencesForm(initial=preferences) + else: + form = UserPreferencesForm() + + return {'view_user': user, 'form': form} @login_required def account_settings(request): @@ -337,4 +413,3 @@ def account_settings(request): 'msg': msg, 'is_openid': is_openid }, context_instance=RequestContext(request)) -