From 26f8acd83ac2a4762b68817fb45cb48f579fefdf Mon Sep 17 00:00:00 2001
From: stef <stefan.marsiske@gmail.com>
Date: Tue, 5 Jul 2011 02:40:21 +0200
Subject: [PATCH] [enh] no pagination for view, proper redir+msg for confirm,
 error if not to be activated

---
 bt/views.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/bt/views.py b/bt/views.py
index c888de0..c6772e1 100644
--- a/bt/views.py
+++ b/bt/views.py
@@ -89,7 +89,8 @@ def confirm(request, id, name=None):
     if c:
         c.key=''
         c.save()
-    return HttpResponse('<div class="confirm_thanks">Thank you for verifying your confirmation</div>')
+    messages.add_message(request, messages.INFO, _('Thank you for verifying your confirmation'))
+    return HttpResponseRedirect('/') # Redirect after POST
 
 def sendverifymail(service,to):
     actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
@@ -168,19 +169,11 @@ def index(request):
         context_instance=RequestContext(request))
 
 def list_violations(request):
-    v_list = Violation.objects.filter(activationid='')
-    paginator = Paginator(v_list, 25)
-
-    page = request.GET.get('page','1')
-    try:
-        violations = paginator.page(page)
-    except PageNotAnInteger:
-        violations = paginator.page(1)
-    except EmptyPage:
-        violations = paginator.page(paginator.num_pages)
-
+    violations = Violation.objects.filter(activationid='')
     return render_to_response('list.html', {"violations": violations},context_instance=RequestContext(request))
 
 def view(request,id):
     v = get_object_or_404(Violation, pk=id)
+    if v.activationid:
+        raise Http404
     return render_to_response('view.html', { 'v': v, },context_instance=RequestContext(request))
-- 
GitLab