Prevents empty digests from being sent.

[osqa.git] / forum / views / users.py

diff --git a/forum/views/users.py b/forum/views/users.py
index 4222acf98d8cd82b493f467e296581ba8e21ac16..8bea106278d27ffd89bf0fcf230f112dd6f4f528 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -21,60 +21,47 @@ from datetime import datetime, date
 import decorators\r
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction\r
 from forum.modules import ui\r
 import decorators\r
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction\r
 from forum.modules import ui\r

+from forum.utils import pagination\r
+from forum.views.readers import QuestionListPaginatorContext, AnswerPaginatorContext\r

 \r
 import time\r
 import decorators\r
 \r
 \r
 import time\r
 import decorators\r
 \r

+class UserReputationSort(pagination.SimpleSort):\r
+    def apply(self, objects):\r
+        return objects.order_by('-is_active', self.order_by)\r
+\r
+class UserListPaginatorContext(pagination.PaginatorContext):\r
+    def __init__(self):\r
+        super (UserListPaginatorContext, self).__init__('USERS_LIST', sort_methods=(\r
+            (_('reputation'), UserReputationSort(_('reputation'), '-reputation', _("sorted by reputation"))),\r
+            (_('newest'), pagination.SimpleSort(_('recent'), '-date_joined', _("newest members"))),\r
+            (_('last'), pagination.SimpleSort(_('oldest'), 'date_joined', _("oldest members"))),\r
+            (_('name'), pagination.SimpleSort(_('by username'), 'username', _("sorted by username"))),\r
+        ), pagesizes=(20, 35, 60))\r
+\r
+class UserAnswersPaginatorContext(pagination.PaginatorContext):\r
+    def __init__(self):\r
+        super (UserAnswersPaginatorContext, self).__init__('USER_ANSWER_LIST', sort_methods=(\r
+            (_('oldest'), pagination.SimpleSort(_('oldest answers'), 'added_at', _("oldest answers will be shown first"))),\r
+            (_('newest'), pagination.SimpleSort(_('newest answers'), '-added_at', _("newest answers will be shown first"))),\r
+            (_('votes'), pagination.SimpleSort(_('popular answers'), '-score', _("most voted answers will be shown first"))),\r
+        ), default_sort=_('votes'), sticky_sort = True, pagesizes=(5, 10, 20), default_pagesize=20, prefix=_('answers'))\r
+\r

 USERS_PAGE_SIZE = 35# refactor - move to some constants file\r
 \r
 @decorators.render('users/users.html', 'users', _('users'), weight=200)\r
 def users(request):\r
 USERS_PAGE_SIZE = 35# refactor - move to some constants file\r
 \r
 @decorators.render('users/users.html', 'users', _('users'), weight=200)\r
 def users(request):\r

-    is_paginated = True\r
-    sortby = request.GET.get('sort', 'reputation')\r

     suser = request.REQUEST.get('q', "")\r
     suser = request.REQUEST.get('q', "")\r

-    try:\r
-        page = int(request.GET.get('page', '1'))\r
-    except ValueError:\r
-        page = 1\r
+    users = User.objects.all()\r

 \r
     if suser == "":\r
 \r
     if suser == "":\r

-        if sortby == "newest":\r
-            objects_list = Paginator(User.objects.all().order_by('-date_joined'), USERS_PAGE_SIZE)\r
-        elif sortby == "last":\r
-            objects_list = Paginator(User.objects.all().order_by('date_joined'), USERS_PAGE_SIZE)\r
-        elif sortby == "user":\r
-            objects_list = Paginator(User.objects.all().order_by('username'), USERS_PAGE_SIZE)\r
-        # default\r
-        else:\r
-            objects_list = Paginator(User.objects.all().order_by('-is_active', '-reputation'), USERS_PAGE_SIZE)\r
-        base_url = reverse('users') + '?sort=%s&' % sortby\r
-    else:\r
-        sortby = "reputation"\r
-        objects_list = Paginator(User.objects.filter(username__icontains=suser).order_by('-reputation'), USERS_PAGE_SIZE\r
-                                 )\r
-        base_url = reverse('users') + '?name=%s&sort=%s&' % (suser, sortby)\r
-\r
-    try:\r
-        users = objects_list.page(page)\r
-    except (EmptyPage, InvalidPage):\r
-        users = objects_list.page(objects_list.num_pages)\r
+        users = users.filter(username__icontains=suser)\r

 \r
 \r

-    return {\r
+    return pagination.paginated(request, ('users', UserListPaginatorContext()), {\r

         "users" : users,\r
         "suser" : suser,\r
         "users" : users,\r
         "suser" : suser,\r

-        "keywords" : suser,\r
-        "tab_id" : sortby,\r
-        "context" : {\r
-            'is_paginated' : is_paginated,\r
-            'pages': objects_list.num_pages,\r
-            'page': page,\r
-            'has_previous': users.has_previous(),\r
-            'has_next': users.has_next(),\r
-            'previous': users.previous_page_number(),\r
-            'next': users.next_page_number(),\r
-            'base_url' : base_url\r
-        }\r
-    }\r
+    })\r

 \r
 \r
 @login_required\r
 \r
 \r
 @login_required\r


@@ -196,23 +183,32 @@ def suspend(request, id):
 \r
 def user_view(template, tab_name, tab_title, tab_description, private=False, tabbed=True, render_to=None, weight=500):\r
     def decorator(fn):\r
 \r
 def user_view(template, tab_name, tab_title, tab_description, private=False, tabbed=True, render_to=None, weight=500):\r
     def decorator(fn):\r

-        def decorated(fn, request, id, slug=None):\r
+        def params(request, id, slug=None):\r

             user = get_object_or_404(User, id=id)\r
             if private and not (user == request.user or request.user.is_superuser):\r
                 return HttpResponseUnauthorized(request)\r
             user = get_object_or_404(User, id=id)\r
             if private and not (user == request.user or request.user.is_superuser):\r
                 return HttpResponseUnauthorized(request)\r

-            context = fn(request, user)\r

 \r
 \r

+            if render_to and (not render_to(user)):\r
+                return HttpResponseRedirect(user.get_profile_url())\r
+\r
+            return [request, user], {}\r
+\r
+        decorated = decorate.params.withfn(params)(fn)\r
+\r
+        def result(context, request, user):\r

             rev_page_title = user.username + " - " + tab_description\r
 \r
             context.update({\r
             rev_page_title = user.username + " - " + tab_description\r
 \r
             context.update({\r

-            "tab": "users",\r
-            "active_tab" : tab_name,\r
-            "tab_description" : tab_description,\r
-            "page_title" : rev_page_title,\r
-            "can_view_private": (user == request.user) or request.user.is_superuser\r
+                "tab": "users",\r
+                "active_tab" : tab_name,\r
+                "tab_description" : tab_description,\r
+                "page_title" : rev_page_title,\r
+                "can_view_private": (user == request.user) or request.user.is_superuser\r

             })\r
             return render_to_response(template, context, context_instance=RequestContext(request))\r
 \r
             })\r
             return render_to_response(template, context, context_instance=RequestContext(request))\r
 \r

+        decorated = decorate.result.withfn(result, needs_params=True)(decorated)\r
+\r

         if tabbed:\r
             def url_getter(vu):\r
                 try:\r
         if tabbed:\r
             def url_getter(vu):\r
                 try:\r


@@ -224,7 +220,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\r
             ))\r
 \r
                 tab_name, tab_title, tab_description,url_getter, private, render_to, weight\r
             ))\r
 \r

-        return decorate.withfn(decorated)(fn)\r
+        return decorated\r

     return decorator\r
 \r
 \r
     return decorator\r
 \r
 \r


@@ -244,7 +240,9 @@ def user_profile(request, user):
     awards = [(Badge.objects.get(id=b['id']), b['count']) for b in\r
               Badge.objects.filter(awards__user=user).values('id').annotate(count=Count('cls')).order_by('-count')]\r
 \r
     awards = [(Badge.objects.get(id=b['id']), b['count']) for b in\r
               Badge.objects.filter(awards__user=user).values('id').annotate(count=Count('cls')).order_by('-count')]\r
 \r

-    return {\r
+    return pagination.paginated(request, (\r
+    ('questions', QuestionListPaginatorContext('USER_QUESTION_LIST', _('questions'), 15)),\r
+    ('answers', UserAnswersPaginatorContext())), {\r

     "view_user" : user,\r
     "questions" : questions,\r
     "answers" : answers,\r
     "view_user" : user,\r
     "questions" : questions,\r
     "answers" : answers,\r


@@ -256,7 +254,7 @@ def user_profile(request, user):
     "user_tags" : user_tags[:50],\r
     "awards": awards,\r
     "total_awards" : len(awards),\r
     "user_tags" : user_tags[:50],\r
     "awards": awards,\r
     "total_awards" : len(awards),\r

-    }\r
+    })\r

     \r
 @user_view('users/recent.html', 'recent', _('recent activity'), _('recent user activity'))\r
 def user_recent(request, user):\r
     \r
 @user_view('users/recent.html', 'recent', _('recent activity'), _('recent user activity'))\r
 def user_recent(request, user):\r