merge jambazov -> trunk

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index a98f1be2902c48dfc9381192e2da6fed262820ae..20eb45cbfb544c3dd76d0da8b5ef05f1c7324d81 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -6,12 +6,21 @@ from django.core.urlresolvers import reverse
 from django.template import RequestContext\r
 from django.utils.translation import ungettext, ugettext as _\r
 from forum.modules import ui, decorate\r
+from datetime import datetime, date\r
+from forum.settings import ONLINE_USERS\r
 import logging\r
 \r
+def login_required(func, request, *args, **kwargs):\r
+    if not request.user.is_authenticated():\r
+        return HttpResponseRedirect(reverse('auth_signin'))\r
+    else:\r
+        return func(request, *args, **kwargs)\r
+\r
 def render(template=None, tab=None, tab_title='', weight=500, tabbed=True):\r
-    def decorator(func):\r
-        def decorated(request, *args, **kwargs):\r
-            context = func(request, *args, **kwargs)\r
+    def decorator(func):        \r
+        def decorated(context, request, *args, **kwargs):\r
+            if request.user.is_authenticated():\r
+                ONLINE_USERS[request.user] = datetime.now()\r
 \r
             if isinstance(context, HttpResponse):\r
                 return context\r
@@ -22,62 +31,14 @@ def render(template=None, tab=None, tab_title='', weight=500, tabbed=True):
             return render_to_response(context.pop('template', template), context,\r
                                       context_instance=RequestContext(request))\r
 \r
-        if tabbed and tab:\r
+        if tabbed and tab and tab_title:\r
             ui.register(ui.PAGE_TOP_TABS,\r
                         ui.PageTab(tab, tab_title, lambda: reverse(func.__name__), weight=weight))\r
             \r
-        return decorated\r
-\r
-    return decorator\r
-\r
-def list(paginate, default_page_size):\r
-    def decorator(func):\r
-        def decorated(request, *args, **kwargs):\r
-            context = func(request, *args, **kwargs)\r
-\r
-            if isinstance(context, HttpResponse):\r
-                return context\r
-\r
-            pagesize = request.utils.page_size(default_page_size)\r
-            page = int(request.GET.get('page', 1))\r
-\r
-            big_list = context[paginate]\r
-            paginator = Paginator(big_list, pagesize)\r
-\r
-            try:\r
-                page_obj = paginator.page(page)\r
-            except EmptyPage:\r
-                raise Http404()\r
-\r
-            context[paginate] = page_obj.object_list.lazy()\r
-\r
-            base_path = context.get('base_path', None) or request.path\r
-            sort = request.utils.sort_method('')\r
-\r
-            context["pagination_context"] = {\r
-            'is_paginated' : True,\r
-            'pages': paginator.num_pages,\r
-            'page': page,\r
-            'has_previous': page_obj.has_previous(),\r
-            'has_next': page_obj.has_next(),\r
-            'previous': page_obj.previous_page_number(),\r
-            'next': page_obj.next_page_number(),\r
-            'base_url' : "%s%ssort=%s&" % (base_path, ('?' in base_path) and '&' or '?', sort),\r
-            'pagesize' : pagesize\r
-            }\r
-\r
-            context['sort_context'] = {\r
-            'base_url': "%s%ssort=" % (base_path, ('?' in base_path) and '&' or '?'),\r
-            'current': sort,\r
-            }\r
-\r
-            return context\r
-\r
-        return decorated\r
+        return decorate.result.withfn(decorated, needs_params=True)(func)\r
 \r
     return decorator\r
 \r
-\r
 class CommandException(Exception):\r
     pass\r
 \r