Commit a8ec1ca9 by dcadams

Modified code such that non-logged in student activates correctly.

parent 1ea65455
...@@ -912,12 +912,13 @@ def activate_account(request, key): ...@@ -912,12 +912,13 @@ def activate_account(request, key):
already_active = False already_active = False
#Enroll student in any pending courses he/she may have if auto_enroll flag is set #Enroll student in any pending courses he/she may have if auto_enroll flag is set
student = request.user student = User.objects.filter(id=r[0].user_id)
ceas = CourseEnrollmentAllowed.objects.filter(email=student.email) if student:
ceas = CourseEnrollmentAllowed.objects.filter(email=student[0].email)
for cea in ceas: for cea in ceas:
if cea.auto_enroll: if cea.auto_enroll:
course_id = cea.course_id course_id = cea.course_id
enrollment, created = CourseEnrollment.objects.get_or_create(user_id=student.id, course_id=course_id) enrollment, created = CourseEnrollment.objects.get_or_create(user_id=student[0].id, course_id=course_id)
resp = render_to_response("registration/activation_complete.html", {'user_logged_in': user_logged_in, 'already_active': already_active}) resp = render_to_response("registration/activation_complete.html", {'user_logged_in': user_logged_in, 'already_active': already_active})
return resp return resp
......
...@@ -81,7 +81,7 @@ class TestInstructorEnrollsStudent(LoginEnrollmentTestCase): ...@@ -81,7 +81,7 @@ class TestInstructorEnrollsStudent(LoginEnrollmentTestCase):
ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) ce = CourseEnrollment.objects.filter(course_id=course.id, user=user)
self.assertEqual(0, len(ce)) self.assertEqual(0, len(ce))
def test_enrollmemt_new_student_autoenroll_on(self): def test_enrollment_new_student_autoenroll_on(self):
''' '''
Do auto-enroll on test Do auto-enroll on test
''' '''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment