all the admin key checking is now done via urls
authornishanth
Wed, 30 Jun 2010 10:50:49 +0530
changeset 75 f7ee769f0d95
parent 74 46c5ae6594df
child 76 c84fc7ace0f5
all the admin key checking is now done via urls
event/views.py
urls.py
--- a/event/views.py	Wed Jun 30 10:45:27 2010 +0530
+++ b/event/views.py	Wed Jun 30 10:50:49 2010 +0530
@@ -120,15 +120,12 @@
 
     return render_to_response("close_quiz.html", {"admin_key":ADMIN_KEY, "quiz_name":num2name[quiz_num]})
 
-def list_toppers(request, admin_key, quiz_num):
+def list_toppers(request, quiz_num):
     """ check for admin key
     Then check for quiz_num in ['11', ..]
     then give appropriate response.
     """
 
-    if not admin_key == ADMIN_KEY:
-        raise Http404
-
     try:
         event = Event.objects.all()[0]
     except IndexError:
@@ -143,15 +140,12 @@
 
     return render_to_response("list_toppers.html", {"sorted_quizzes":sorted_quizzes,"admin_key":ADMIN_KEY, "event":event, "quiz_name":num2name[quiz_num]})
 
-def user_dump(request, admin_key, quiz_key, user_name):
+def user_dump(request, quiz_key, user_name):
     """ check for admin_key
     then get quiz by quiz_key and user_name.
     then display the dump
     """
 
-    if not admin_key == ADMIN_KEY:
-        raise Http404
-
     try:
         event = Event.objects.all()[0]
     except IndexError:
@@ -174,14 +168,11 @@
     else:
         return render_to_response("user_dump.html", {"quiz":quiz, "quiz_name":quiz_name, "admin_key":ADMIN_KEY}) 
 
-def que_dump(request, admin_key, que_id):
+def que_dump(request, que_id):
     """ check for admin key
     then simply render all answers corresponding to the question.
     """
 
-    if not admin_key == ADMIN_KEY:
-        raise Http404
-
     try:
         event = Event.objects.all()[0]
     except IndexError:
--- a/urls.py	Wed Jun 30 10:45:27 2010 +0530
+++ b/urls.py	Wed Jun 30 10:50:49 2010 +0530
@@ -39,7 +39,7 @@
     (r'^quiz/answer/(\w+)$', quiz_views.answer),
     (r'^quiz/complete/$', quiz_views.quiz_complete),
 
-    (r'^quiz/toppers/(\w+)/(\w+)$', event_views.list_toppers),
-    (r'^quiz/user_dump/(\w+)/(\w+)/(\w+)$', event_views.user_dump),
-    (r'^quiz/que_dump/(\w+)/(\w+)$', event_views.que_dump),
+    (r'^quiz/toppers/%s/(\w+)$'%AK, event_views.list_toppers),
+    (r'^quiz/user_dump/%s/(\w+)/(\w+)$'%AK, event_views.user_dump),
+    (r'^quiz/que_dump/%s/(\w+)$'%AK, event_views.que_dump),
 )