changed these files to use blocktrans instead.

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index 141887a3e0f7cfdc8a4402c04205ec1ca35ed276..db6dec48e9712f194cac483bdf74e5c49a72c6a2 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -1,6 +1,6 @@
-from django.http import HttpResponse, HttpResponseRedirect\r
+from django.http import HttpResponse, HttpResponseRedirect, Http404\r

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

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

 from django.shortcuts import render_to_response\r
 from django.template import RequestContext\r
 from django.utils.translation import ungettext, ugettext as _\r
 from django.shortcuts import render_to_response\r
 from django.template import RequestContext\r
 from django.utils.translation import ungettext, ugettext as _\r


@@ -14,8 +14,11 @@ def render(template=None, tab=None):
             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

         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


@@ -29,37 +32,48 @@ def list(paginate, default_page_size):
             big_list = context[paginate]\r
             paginator = Paginator(big_list, pagesize)\r
 \r
             big_list = context[paginate]\r
             paginator = Paginator(big_list, pagesize)\r
 \r

-            page_obj = paginator.page(page)\r
+            try:\r
+                page_obj = paginator.page(page)\r
+            except EmptyPage:\r
+                raise Http404()\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
 def command(func):\r
     def decorated(request, *args, **kwargs):\r
 \r
 def command(func):\r
     def decorated(request, *args, **kwargs):\r


@@ -71,19 +85,20 @@ def command(func):
 \r
             response['success'] = True\r
         except Exception, e:\r
 \r
             response['success'] = True\r
         except Exception, e:\r

-            #import sys, traceback\r
-            #traceback.print_exc(file=sys.stdout)\r
+            import traceback\r
+            #traceback.print_exc()\r

 \r
             if isinstance(e, CommandException):\r
                 response = {\r
 \r
             if isinstance(e, CommandException):\r
                 response = {\r

-                    'success': False,\r
-                    'error_message': str(e)\r
+                'success': False,\r
+                'error_message': e.message\r

                 }\r
             else:\r
                 logging.error("%s: %s" % (func.__name__, str(e)))\r
                 }\r
             else:\r
                 logging.error("%s: %s" % (func.__name__, str(e)))\r

+                logging.error(traceback.format_exc())\r

                 response = {\r
                 response = {\r

-                    'success': False,\r
-                    'error_message': _("We're sorry, but an unknown error ocurred.<br />Please try again in a while.")\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
                 }\r
 \r
         if request.is_ajax():\r