X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/6b22f44c53cf0d72a7b2b068f51cae01e1129e23..afa2b5ca9e29a5f2f3dfa8f94a5be2f9e612d719:/forum/views/decorators.py?ds=sidebyside

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index 4eb832a..9cb8cbd 100644
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -1,17 +1,30 @@
-from django.http import HttpResponse, HttpResponseRedirect, Http404
+# -*- coding: utf-8 -*-
+
+import logging
+
+from datetime import datetime
+
+from django.http import HttpResponse, HttpResponseRedirect
 from django.utils import simplejson
-from django.core.paginator import Paginator, EmptyPage
 from django.shortcuts import render_to_response
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
-from django.utils.translation import ungettext, ugettext as _
-from forum.modules import ui
-import logging
+from django.utils.translation import ugettext as _
+
+from forum.modules import ui, decorate
+from forum.settings import ONLINE_USERS
+
+def login_required(func, request, *args, **kwargs):
+    if not request.user.is_authenticated():
+        return HttpResponseRedirect(reverse('auth_signin'))
+    else:
+        return func(request, *args, **kwargs)
 
 def render(template=None, tab=None, tab_title='', weight=500, tabbed=True):
-    def decorator(func):
-        def decorated(request, *args, **kwargs):
-            context = func(request, *args, **kwargs)
+    def decorator(func):        
+        def decorated(context, request, *args, **kwargs):
+            if request.user.is_authenticated():
+                ONLINE_USERS[request.user] = datetime.now()
 
             if isinstance(context, HttpResponse):
                 return context
@@ -22,62 +35,14 @@ def render(template=None, tab=None, tab_title='', weight=500, tabbed=True):
             return render_to_response(context.pop('template', template), context,
                                       context_instance=RequestContext(request))
 
-        if tabbed and tab:
+        if tabbed and tab and tab_title:
             ui.register(ui.PAGE_TOP_TABS,
                         ui.PageTab(tab, tab_title, lambda: reverse(func.__name__), weight=weight))
             
-        return decorated
+        return decorate.result.withfn(decorated, needs_params=True)(func)
 
     return decorator
 
-def list(paginate, default_page_size):
-    def decorator(func):
-        def decorated(request, *args, **kwargs):
-            context = func(request, *args, **kwargs)
-
-            if isinstance(context, HttpResponse):
-                return context
-
-            pagesize = request.utils.page_size(default_page_size)
-            page = int(request.GET.get('page', 1))
-
-            big_list = context[paginate]
-            paginator = Paginator(big_list, pagesize)
-
-            try:
-                page_obj = paginator.page(page)
-            except EmptyPage:
-                raise Http404()
-
-            context[paginate] = page_obj.object_list.lazy()
-
-            base_path = context.get('base_path', None) or request.path
-            sort = request.utils.sort_method('')
-
-            context["pagination_context"] = {
-            'is_paginated' : True,
-            'pages': paginator.num_pages,
-            'page': page,
-            'has_previous': page_obj.has_previous(),
-            'has_next': page_obj.has_next(),
-            'previous': page_obj.previous_page_number(),
-            'next': page_obj.next_page_number(),
-            'base_url' : "%s%ssort=%s&" % (base_path, ('?' in base_path) and '&' or '?', sort),
-            'pagesize' : pagesize
-            }
-
-            context['sort_context'] = {
-            'base_url': "%s%ssort=" % (base_path, ('?' in base_path) and '&' or '?'),
-            'current': sort,
-            }
-
-            return context
-
-        return decorated
-
-    return decorator
-
-
 class CommandException(Exception):
     pass
 
@@ -87,35 +52,33 @@ class RefreshPageCommand(HttpResponse):
                 content=simplejson.dumps({'commands': {'refresh_page': []}, 'success': True}),
                 mimetype="application/json")
 
-def command(func):
-    def decorated(request, *args, **kwargs):
-        try:
-            response = func(request, *args, **kwargs)
-
-            if isinstance(response, HttpResponse):
-                return response
-
-            response['success'] = True
-        except Exception, e:
-            import traceback
-            #traceback.print_exc()
-
-            if isinstance(e, CommandException):
-                response = {
-                'success': False,
-                'error_message': e.message
-                }
-            else:
-                logging.error("%s: %s" % (func.__name__, str(e)))
-                logging.error(traceback.format_exc())
-                response = {
-                'success': False,
-                'error_message': _("We're sorry, but an unknown error ocurred.<br />Please try again in a while.")
-                }
-
-        if request.is_ajax():
-            return HttpResponse(simplejson.dumps(response), mimetype="application/json")
+def command(func, request, *args, **kwargs):
+    try:
+        response = func(request, *args, **kwargs)
+
+        if isinstance(response, HttpResponse):
+            return response
+
+        response['success'] = True
+    except Exception, e:
+        import traceback
+        #traceback.print_exc()
+
+        if isinstance(e, CommandException):
+            response = {
+            'success': False,
+            'error_message': e.message
+            }
         else:
-            return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
+            logging.error("%s: %s" % (func.__name__, str(e)))
+            logging.error(traceback.format_exc())
+            response = {
+            'success': False,
+            'error_message': _("We're sorry, but an unknown error ocurred.<br />Please try again in a while.")
+            }
+
+    if request.is_ajax():
+        return HttpResponse(simplejson.dumps(response), mimetype="application/json")
+    else:
+        return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
-    return decorated
\ No newline at end of file