From a8ec1ca9d5804823772a6634cbf2cbee6bb8f426 Mon Sep 17 00:00:00 2001
From: dcadams <dcadams@stanford.edu>
Date: Tue, 4 Jun 2013 17:08:34 -0700
Subject: [PATCH] Modified code such that non-logged in student activates
 correctly.

---
 common/djangoapps/student/views.py                 | 13 +++++++------
 lms/djangoapps/instructor/tests/test_enrollment.py |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index fd0f643af0..661b1da26b 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -912,12 +912,13 @@ def activate_account(request, key):
             already_active = False
 
         #Enroll student in any pending courses he/she may have if auto_enroll flag is set
-        student = request.user
-        ceas = CourseEnrollmentAllowed.objects.filter(email=student.email)
-        for cea in ceas:
-            if cea.auto_enroll:
-                course_id = cea.course_id
-                enrollment, created = CourseEnrollment.objects.get_or_create(user_id=student.id, course_id=course_id)
+        student = User.objects.filter(id=r[0].user_id)
+        if student:
+            ceas = CourseEnrollmentAllowed.objects.filter(email=student[0].email)
+            for cea in ceas:
+                if cea.auto_enroll:
+                    course_id = cea.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})
         return resp
diff --git a/lms/djangoapps/instructor/tests/test_enrollment.py b/lms/djangoapps/instructor/tests/test_enrollment.py
index fcbe1381e6..ce5f2d2e50 100644
--- a/lms/djangoapps/instructor/tests/test_enrollment.py
+++ b/lms/djangoapps/instructor/tests/test_enrollment.py
@@ -81,7 +81,7 @@ class TestInstructorEnrollsStudent(LoginEnrollmentTestCase):
         ce = CourseEnrollment.objects.filter(course_id=course.id, user=user)
         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
         '''