summaryrefslogtreecommitdiff
path: root/allotter/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'allotter/views.py')
-rw-r--r--allotter/views.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/allotter/views.py b/allotter/views.py
index fb819fc..c8a44a8 100644
--- a/allotter/views.py
+++ b/allotter/views.py
@@ -124,8 +124,8 @@ def user_logout(request):
return redirect ('/allotter/login/')
#TODO: Extensive Testing
-
@login_required
+>>>>>>> master
def submit_options(request, reg_no):
"""
Gets the Options and their preference number through the POST object and
@@ -162,6 +162,7 @@ def submit_options(request, reg_no):
user_application.save()
return HttpResponseRedirect(reverse('allotter.views.complete_allotment', args=(reg_no,)))
+
def complete_allotment(request, reg_no):
"""
Passes the chosen options queryset to the Completion Page Template