summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrimal Pappachan2012-03-09 10:20:47 +0530
committerPrimal Pappachan2012-03-09 10:20:47 +0530
commit8f49201fca1e7a8cf4c767285e6c05534095b12a (patch)
tree5355f381a986b5d06685e9c7954721e2994b810e
parent27defff715ff61003943b93ed3655fe60ca8d3dc (diff)
downloadaloha-8f49201fca1e7a8cf4c767285e6c05534095b12a.tar.gz
aloha-8f49201fca1e7a8cf4c767285e6c05534095b12a.tar.bz2
aloha-8f49201fca1e7a8cf4c767285e6c05534095b12a.zip
Fixed the options display on Application form
-rw-r--r--allotter/models.py6
-rw-r--r--allotter/urls.py2
-rw-r--r--allotter/views.py2
3 files changed, 6 insertions, 4 deletions
diff --git a/allotter/models.py b/allotter/models.py
index 5b35771..97c732d 100644
--- a/allotter/models.py
+++ b/allotter/models.py
@@ -4,9 +4,9 @@ from django.contrib.auth.models import User
from datetime import datetime
EXAMINATION_SUBJECTS = (
- ("phy", "Physics"),
- ("math", "Mathematics"),
- ("chem", "Chemistry"),
+ ("Physics", "Physics"),
+ ("Mathematics", "Mathematics"),
+ ("Chemistry", "Chemistry"),
)
CATEGORIES = (
diff --git a/allotter/urls.py b/allotter/urls.py
index 79b1d22..b90e200 100644
--- a/allotter/urls.py
+++ b/allotter/urls.py
@@ -5,4 +5,6 @@ urlpatterns = patterns('allotter.views',
url(r'^login/$', 'user_login'),
url(r'^register/$', 'user_register'),
url(r'^apply/$', 'apply'),
+ url(r'^quit/$', 'quit'),
+ url(r'^save/$', 'save'),
)
diff --git a/allotter/views.py b/allotter/views.py
index 01425df..52d1d0e 100644
--- a/allotter/views.py
+++ b/allotter/views.py
@@ -76,7 +76,7 @@ def apply(request):
return redirect('/allotter/login/')
user_profile = user.get_profile()
subject = user_profile.exam_code
- options_available = Option.objects.filter(exam__exam_code=subject).distinct()
+ options_available = Option.objects.filter(exam__exam_name=subject).distinct()
context = {'user': user, 'subject': subject,
'options' : options_available}
ci = RequestContext(request)