X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f589e41b46ab266706a7f82a5562f50805359b26..700b6dec7e4d655fee91e26f9757442162047281:/forum/views/users.py

diff --git a/forum/views/users.py b/forum/views/users.py
index fa57542..306747a 100644
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -22,6 +22,7 @@ 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 decorators
@@ -39,6 +40,14 @@ class UserListPaginatorContext(pagination.PaginatorContext):
             (_('name'), pagination.SimpleSort(_('by username'), 'username', _("sorted by username"))),
         ), pagesizes=(20, 35, 60))
 
+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,10 +55,10 @@ 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,
     })
@@ -69,6 +78,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'])
@@ -231,7 +246,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,
@@ -243,7 +260,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):
@@ -310,6 +327,25 @@ def user_subscriptions(request, user):
 
     return {'view_user':user, 'notificatons_on': enabled, 'form':form}
 
+@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}
+
 @login_required
 def account_settings(request):
     logging.debug('')