summaryrefslogtreecommitdiff
path: root/workshop_app/views.py
diff options
context:
space:
mode:
authorAkshen2017-05-03 12:10:54 +0530
committerAkshen2017-05-19 15:30:31 +0530
commit7fed0d3b38f84500780109ca5d1e4e377637459e (patch)
tree40557323eda4eb4635c124e6cf4a6428a5d9f55c /workshop_app/views.py
parent992383b918f684c4a66e535d4f587c6fe2e24a48 (diff)
downloadworkshop_booking-7fed0d3b38f84500780109ca5d1e4e377637459e.tar.gz
workshop_booking-7fed0d3b38f84500780109ca5d1e4e377637459e.tar.bz2
workshop_booking-7fed0d3b38f84500780109ca5d1e4e377637459e.zip
Minor Bug fix
Todo Optimization and chatbot
Diffstat (limited to 'workshop_app/views.py')
-rw-r--r--workshop_app/views.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/workshop_app/views.py b/workshop_app/views.py
index 2abcb31..a9e8be1 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -19,7 +19,6 @@ from django.shortcuts import render, redirect
from django.db import IntegrityError
from django.utils import timezone
from collections import OrderedDict
-from .decorators import email_verified
from dateutil.parser import parse
from .send_mails import send_email
from django.http import HttpResponse, HttpResponseRedirect
@@ -270,7 +269,6 @@ def book_workshop(request):
else:
for w in workshop_recurrence_list:
if workshop_date == (w.strftime("%d-%m-%Y")):
- print(workshop_date)
rW_obj.requested_workshop_instructor = workshop.workshop_instructor
rW_obj.requested_workshop_coordinator = request.user
rW_obj.requested_workshop_date = datetime.strptime(
@@ -583,9 +581,8 @@ def my_workshops(request):
except EmptyPage:
#If page is out of range(e.g 999999), deliver last page.
workshop_occurences = paginator.page(paginator.num_pages)
- template = 'workshop_app/my_workshops.html'
-
-
+ return render(request, 'workshop_app/my_workshops.html',
+ { "workshop_occurences" :workshop_occurences})
else:
workshops = []
@@ -612,7 +609,8 @@ def my_workshops(request):
except EmptyPage:
#If page is out of range(e.g 999999), deliver last page.
workshop_occurences = paginator.page(paginator.num_pages)
- template = 'workshop_app/my_workshops.html'
+ return render(request, 'workshop_app/my_workshops.html',
+ {"workshop_occurences": workshop_occurences})
else:
return redirect('/login/')