Fix OSQA-819: Link to profile in message is wrong if OSQA is installed in a subfolder

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index 2219f98174a36b4721c46f2676ac33b3145c51a0..3bede665ddaf966b54829039accc29d1afb4ec6f 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -1,71 +1,83 @@
-from django.http import HttpResponse, HttpResponseRedirect, Http404\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.utils.translation import ungettext, ugettext as _\r
-from forum.modules import ui, decorate\r
-import logging\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
-\r
-            if isinstance(context, HttpResponse):\r
-                return context\r
-\r
-            if tab is not None:\r
-                context['tab'] = tab\r
-\r
-            return render_to_response(context.pop('template', template), context,\r
-                                      context_instance=RequestContext(request))\r
-\r
-        if tabbed and tab:\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
-\r
-    return decorator\r
-\r
-class CommandException(Exception):\r
-    pass\r
-\r
-class RefreshPageCommand(HttpResponse):\r
-    def __init__(self):\r
-        super(RefreshPageCommand, self).__init__(\r
-                content=simplejson.dumps({'commands': {'refresh_page': []}, 'success': True}),\r
-                mimetype="application/json")\r
-\r
-def command(func, request, *args, **kwargs):\r
-    try:\r
-        response = func(request, *args, **kwargs)\r
-\r
-        if isinstance(response, HttpResponse):\r
-            return response\r
-\r
-        response['success'] = True\r
-    except Exception, e:\r
-        import traceback\r
-        #traceback.print_exc()\r
-\r
-        if isinstance(e, CommandException):\r
-            response = {\r
-            'success': False,\r
-            'error_message': e.message\r
-            }\r
-        else:\r
-            logging.error("%s: %s" % (func.__name__, str(e)))\r
-            logging.error(traceback.format_exc())\r
-            response = {\r
-            'success': False,\r
-            'error_message': _("We're sorry, but an unknown error ocurred.<br />Please try again in a while.")\r
-            }\r
-\r
-    if request.is_ajax():\r
-        return HttpResponse(simplejson.dumps(response), mimetype="application/json")\r
-    else:\r
-        return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))\r
-\r
+# -*- coding: utf-8 -*-
+import json
+import logging
+
+from datetime import datetime
+
+from django.http import HttpResponse, HttpResponseRedirect
+from django.shortcuts import render_to_response
+from django.core.urlresolvers import reverse
+from django.template import RequestContext
+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(context, request, *args, **kwargs):
+            if request.user.is_authenticated():
+                ONLINE_USERS[request.user] = datetime.now()
+
+            if isinstance(context, HttpResponse):
+                return context
+
+            if tab is not None:
+                context['tab'] = tab
+
+            return render_to_response(context.pop('template', template), context,
+                                      context_instance=RequestContext(request))
+
+        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 decorate.result.withfn(decorated, needs_params=True)(func)
+
+    return decorator
+
+class CommandException(Exception):
+    pass
+
+class RefreshPageCommand(HttpResponse):
+    def __init__(self):
+        super(RefreshPageCommand, self).__init__(
+                content=json.dumps({'commands': {'refresh_page': []}, 'success': True}),
+                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:
+            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(json.dumps(response), mimetype="application/json")
+    else:
+        return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
+