Fixes OSQA 281, Start/Stop notificatins button does not store the notifications and...

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

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index 44ec8bad9142d44ed8beb1930a20309f7a478a23..37413d29e6872039ef10830ef3746b7b900b1ea9 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


@@ -29,7 +29,11 @@ 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
             context[paginate] = page_obj.object_list.lazy()\r
 \r
             base_path = context.get('base_path', None) or request.path\r


@@ -71,13 +75,13 @@ 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 sys, traceback\r
+            #traceback.print_exc(file=sys.stdout)\r

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

-                    'error_message': str(e)\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