OSQA-375

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index db6dec48e9712f194cac483bdf74e5c49a72c6a2..a98f1be2902c48dfc9381192e2da6fed262820ae 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -2,21 +2,30 @@ from django.http import HttpResponse, HttpResponseRedirect, Http404
 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):\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
 \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 decorated\r
 \r
     return decorator\r
@@ -26,6 +35,9 @@ def list(paginate, default_page_size):
         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
@@ -75,35 +87,33 @@ class RefreshPageCommand(HttpResponse):
                 content=simplejson.dumps({'commands': {'refresh_page': []}, 'success': True}),\r
                 mimetype="application/json")\r
 \r
-def command(func):\r
-    def decorated(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
+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
-            return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))\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
-    return decorated
\ No newline at end of file