use case insensitive query when retrieving the User object without ID in the URL

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index 2219f98174a36b4721c46f2676ac33b3145c51a0..9cb8cbd4ca08d622f0a3edb9f8cd18e1a4eae629 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -1,17 +1,30 @@
-from django.http import HttpResponse, HttpResponseRedirect, Http404\r
+# -*- coding: utf-8 -*-\r
+\r
+import logging\r
+\r
+from datetime import datetime\r
+\r
+from django.http import HttpResponse, HttpResponseRedirect\r

 from django.utils import simplejson\r
 from django.utils import simplejson\r

-from django.core.paginator import Paginator, EmptyPage\r

 from django.shortcuts import render_to_response\r
 from django.core.urlresolvers import reverse\r
 from django.template import RequestContext\r
 from django.shortcuts import render_to_response\r
 from django.core.urlresolvers import reverse\r
 from django.template import RequestContext\r

-from django.utils.translation import ungettext, ugettext as _\r
+from django.utils.translation import ugettext as _\r
+\r

 from forum.modules import ui, decorate\r
 from forum.modules import ui, decorate\r

-import logging\r
+from forum.settings import ONLINE_USERS\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
 \r
 def render(template=None, tab=None, tab_title='', weight=500, tabbed=True):\r

-    def decorator(func):\r
-        def decorated(func, 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 +35,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 decorate.withfn(decorated)(func)\r
+        return decorate.result.withfn(decorated, needs_params=True)(func)\r

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