Merge pull request #272 from ankitjavalkar/course-code

Course code feature

1 files changed, 17 insertions, 6 deletions

diff --git a/yaksh/views.py b/yaksh/views.py
index 94cb0c6..d298e5e 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -122,14 +122,25 @@ def user_logout(request):
 def quizlist_user(request, enrolled=None):
     """Show All Quizzes that is available to logged-in user."""
     user = request.user
-    if enrolled is not None:
+    ci = RequestContext(request)
+
+    if request.method == "POST":
+        course_code = request.POST.get('course_code')
+        hidden_courses = Course.objects.get_hidden_courses(code=course_code)
+        courses = hidden_courses if hidden_courses else None
+        title = 'Search'
+
+    elif enrolled is not None:
         courses = user.students.all()
         title = 'Enrolled Courses'
     else:
-        courses = Course.objects.filter(active=True, is_trial=False)
+        courses = Course.objects.filter(active=True, is_trial=False, hidden=False)
         title = 'All Courses'
+
     context = {'user': user, 'courses': courses, 'title': title}
-    return my_render_to_response("yaksh/quizzes_user.html", context)
+
+    return my_render_to_response("yaksh/quizzes_user.html", context,
+        context_instance=ci)
 
 
 @login_required
@@ -639,8 +650,8 @@ def enroll_request(request, course_id):
     user = request.user
     ci = RequestContext(request)
     course = get_object_or_404(Course, pk=course_id)
-    if not course.is_active_enrollment:
-        msg = 'Enrollment for this course has been closed, please contact your '\
+    if not course.is_active_enrollment and course.hidden:
+        msg = 'Unable to add enrollments for this course, please contact your '\
             'instructor/administrator.'
         return complete(request, msg, attempt_num=None, questionpaper_id=None)
 
@@ -1238,7 +1249,7 @@ def search_teacher(request, course_id):
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
 
-    context = {}
+    context = {'success': False}
     course = get_object_or_404(Course, pk=course_id)
     context['course'] = course