OSQA-313

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index cf5f90373288f5b5a7e45dca546a1bb88e0b4e67..37413d29e6872039ef10830ef3746b7b900b1ea9 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -1,8 +1,10 @@
-from django.http import HttpResponse, HttpResponseRedirect\r
+from django.http import HttpResponse, HttpResponseRedirect, Http404\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
+import logging\r
 \r
 def render(template=None, tab=None):\r
     def decorator(func):\r
@@ -27,8 +29,12 @@ def list(paginate, default_page_size):
             big_list = context[paginate]\r
             paginator = Paginator(big_list, pagesize)\r
 \r
-            page_obj = paginator.page(page)\r
-            context[paginate] = page_obj.object_list\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
@@ -55,19 +61,34 @@ def list(paginate, default_page_size):
     return decorator\r
 \r
 \r
+class CommandException(Exception):\r
+    pass\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
-            response = {\r
-                'success': False,\r
-                'error_message': str(e)\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
+                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