X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..febc8df810701062ed45c129c0e30c504db28849:/forum/views/decorators.py

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index 02dd736..37413d2 100644
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -1,8 +1,10 @@
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.utils import simplejson
-from django.core.paginator import Paginator
+from django.core.paginator import Paginator, EmptyPage
 from django.shortcuts import render_to_response
 from django.template import RequestContext
+from django.utils.translation import ungettext, ugettext as _
+import logging
 
 def render(template=None, tab=None):
     def decorator(func):
@@ -27,8 +29,12 @@ def list(paginate, default_page_size):
             big_list = context[paginate]
             paginator = Paginator(big_list, pagesize)
 
-            page_obj = paginator.page(page)
-            context[paginate] = page_obj.object_list
+            try:
+                page_obj = paginator.page(page)
+            except EmptyPage:
+                raise Http404()
+                
+            context[paginate] = page_obj.object_list.lazy()
 
             base_path = context.get('base_path', None) or request.path
             sort = request.utils.sort_method('')
@@ -41,7 +47,7 @@ def list(paginate, default_page_size):
                 'has_next': page_obj.has_next(),
                 'previous': page_obj.previous_page_number(),
                 'next': page_obj.next_page_number(),
-                'base_url' : "%s%ssort=%s" % (base_path, ('?' in base_path) and '&' or '?', sort),
+                'base_url' : "%s%ssort=%s&" % (base_path, ('?' in base_path) and '&' or '?', sort),
                 'pagesize' : pagesize
             }
 
@@ -55,19 +61,34 @@ def list(paginate, default_page_size):
     return decorator
 
 
+class CommandException(Exception):
+    pass
+
+
 def command(func):
     def decorated(request, *args, **kwargs):
         try:
             response = func(request, *args, **kwargs)
+
+            if isinstance(response, HttpResponse):
+                return response
+
             response['success'] = True
         except Exception, e:
-            import sys, traceback
-            traceback.print_exc(file=sys.stdout)
-
-            response = {
-                'success': False,
-                'error_message': str(e)
-            }
+            #import sys, traceback
+            #traceback.print_exc(file=sys.stdout)
+
+            if isinstance(e, CommandException):
+                response = {
+                    'success': False,
+                    'error_message': e.message
+                }
+            else:
+                logging.error("%s: %s" % (func.__name__, str(e)))
+                response = {
+                    'success': False,
+                    'error_message': _("We're sorry, but an unknown error ocurred.<br />Please try again in a while.")
+                }
 
         if request.is_ajax():
             return HttpResponse(simplejson.dumps(response), mimetype="application/json")