Fixed http://jira.osqa.net/browse/OSQA-214 and improved awarded badges list.

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index 02dd736035b32496cdec306cf9683bdf2b5dc4cb..44ec8bad9142d44ed8beb1930a20309f7a478a23 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -3,6 +3,8 @@ from django.utils import simplejson
 from django.core.paginator import Paginator\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
@@ -28,7 +30,7 @@ def list(paginate, default_page_size):
             paginator = Paginator(big_list, pagesize)\r
 \r
             page_obj = paginator.page(page)\r
-            context[paginate] = page_obj.object_list\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
@@ -41,7 +43,7 @@ def list(paginate, default_page_size):
                 '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
+                'base_url' : "%s%ssort=%s&" % (base_path, ('?' in base_path) and '&' or '?', sort),\r
                 'pagesize' : pagesize\r
             }\r
 \r
@@ -55,19 +57,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': 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