Shows user diamonds in some missing spots, and adds some improvements to module decor...

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index f9929ffacde158b7175c91f441d139f160e02853..a98f1be2902c48dfc9381192e2da6fed262820ae 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -2,20 +2,32 @@ 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.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 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
 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
     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
             if tab is not None:\r
                 context['tab'] = tab\r
 \r

-            return render_to_response(context.pop('template', template), context, context_instance=RequestContext(request))\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
         return decorated\r

+\r

     return decorator\r
 \r
 def list(paginate, default_page_size):\r
     return decorator\r
 \r
 def list(paginate, default_page_size):\r


@@ -23,6 +35,9 @@ def list(paginate, default_page_size):
         def decorated(request, *args, **kwargs):\r
             context = func(request, *args, **kwargs)\r
 \r
         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
             pagesize = request.utils.page_size(default_page_size)\r
             page = int(request.GET.get('page', 1))\r
 \r


@@ -33,66 +48,72 @@ def list(paginate, default_page_size):
                 page_obj = paginator.page(page)\r
             except EmptyPage:\r
                 raise Http404()\r
                 page_obj = paginator.page(page)\r
             except EmptyPage:\r
                 raise Http404()\r

-                \r
+\r

             context[paginate] = page_obj.object_list.lazy()\r
 \r
             base_path = context.get('base_path', None) or request.path\r
             sort = request.utils.sort_method('')\r
 \r
             context["pagination_context"] = {\r
             context[paginate] = page_obj.object_list.lazy()\r
 \r
             base_path = context.get('base_path', None) or request.path\r
             sort = request.utils.sort_method('')\r
 \r
             context["pagination_context"] = {\r

-                'is_paginated' : True,\r
-                'pages': paginator.num_pages,\r
-                'page': page,\r
-                'has_previous': page_obj.has_previous(),\r
-                'has_next': page_obj.has_next(),\r
-                'previous': page_obj.previous_page_number(),\r
-                'next': page_obj.next_page_number(),\r
-                'base_url' : "%s%ssort=%s&" % (base_path, ('?' in base_path) and '&' or '?', sort),\r
-                'pagesize' : pagesize\r
+            'is_paginated' : True,\r
+            'pages': paginator.num_pages,\r
+            'page': page,\r
+            'has_previous': page_obj.has_previous(),\r
+            'has_next': page_obj.has_next(),\r
+            'previous': page_obj.previous_page_number(),\r
+            'next': page_obj.next_page_number(),\r
+            'base_url' : "%s%ssort=%s&" % (base_path, ('?' in base_path) and '&' or '?', sort),\r
+            'pagesize' : pagesize\r

             }\r
 \r
             context['sort_context'] = {\r
             }\r
 \r
             context['sort_context'] = {\r

-                'base_url': "%s%ssort=" % (base_path, ('?' in base_path) and '&' or '?'),\r
-                'current': sort,\r
+            'base_url': "%s%ssort=" % (base_path, ('?' in base_path) and '&' or '?'),\r
+            'current': sort,\r

             }\r
 \r
             return context\r
             }\r
 \r
             return context\r

+\r

         return decorated\r
         return decorated\r

+\r

     return decorator\r
 \r
 \r
 class CommandException(Exception):\r
     pass\r
 \r
     return decorator\r
 \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
 \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 sys, traceback\r
-            #traceback.print_exc(file=sys.stdout)\r
-\r
-            if isinstance(e, CommandException):\r
-                response = {\r
-                    'success': False,\r
-                    'error_message': str(e)\r
-                }\r
-            else:\r
-                logging.error("%s: %s" % (func.__name__, str(e)))\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
         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
 \r

-    return decorated
\ No newline at end of file