Bugfix for javascript upload OSQA-487

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index d86a62eee838e1d2bd639bb608a4168de6da124c..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 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
 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 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
 \r
             if isinstance(context, HttpResponse):\r
                 return context\r


@@ -22,11 +31,11 @@ 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
             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
             ui.register(ui.PAGE_TOP_TABS,\r
                         ui.PageTab(tab, tab_title, lambda: reverse(func.__name__), weight=weight))\r
             \r

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

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