From bb288663db63dad5699dbc1f60e93ba8b77f8e57 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mitx.mit.edu>
Date: Wed, 21 Mar 2012 10:10:49 -0400
Subject: [PATCH] Last commit missing -a

---
 djangoapps/student/models.py | 8 ++++++++
 djangoapps/student/views.py  | 9 +++++++--
 templates/profile.html       | 4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/djangoapps/student/models.py b/djangoapps/student/models.py
index b5b89b3171..94034bf8d5 100644
--- a/djangoapps/student/models.py
+++ b/djangoapps/student/models.py
@@ -109,6 +109,8 @@ def change_name(email, new_name):
     up.save()
 
 def user_count():
+    print "All users", User.objects.all().count()
+    print "Active users", User.objects.filter(is_active = True).count()
     return User.objects.all().count()
 
 def active_user_count():
@@ -129,3 +131,9 @@ def remove_user_from_group(group, user):
     utg = UserTestGroup.objects.get(name = group)
     utg.users.remove(User.objects.get(username = user))
     utg.save()
+
+def add_user_to_default_group(group, description, user):
+    utg = UserTestGroup.objects.get(name = group)
+    utg.users.add(User.objects.get(username = user))
+    utg.save()
+
diff --git a/djangoapps/student/views.py b/djangoapps/student/views.py
index aa3d0fb326..9346ac3a3a 100644
--- a/djangoapps/student/views.py
+++ b/djangoapps/student/views.py
@@ -92,6 +92,8 @@ def logout_user(request):
 
 @ensure_csrf_cookie
 def change_setting(request):
+    ''' JSON call to change a profile setting: Right now, location and language
+    '''
     if not request.user.is_authenticated():
         return redirect('/')
     up = UserProfile.objects.get(user=request.user) #request.user.profile_cache
@@ -109,6 +111,7 @@ def change_setting(request):
 
 @ensure_csrf_cookie
 def create_account(request, post_override=None):
+    ''' JSON call to enroll in the course. '''
     js={'success':False}
     
     post_vars = post_override if post_override else request.POST
@@ -380,6 +383,7 @@ def confirm_email_change(request, key):
 
 @ensure_csrf_cookie
 def change_name_request(request):
+    ''' Log a request for a new name. '''
     if not request.user.is_authenticated:
         raise Http404
     
@@ -399,6 +403,7 @@ def change_name_request(request):
 
 @ensure_csrf_cookie
 def pending_name_changes(request):
+    ''' Web page which allows staff to approve or reject name changes. '''
     print request.user.is_staff, request.user
     if not request.user.is_staff:
         print "AAAA"
@@ -415,7 +420,7 @@ def pending_name_changes(request):
 
 @ensure_csrf_cookie
 def reject_name_change(request):
-    ''' Course staff clicks 'reject' on a given name change '''
+    ''' JSON: Name change process. Course staff clicks 'reject' on a given name change '''
     if not request.user.is_staff:
         raise Http404
 
@@ -429,7 +434,7 @@ def reject_name_change(request):
 
 @ensure_csrf_cookie
 def accept_name_change(request):
-    ''' Course staff clicks 'accept' on a given name change '''
+    ''' JSON: Name change process. Course staff clicks 'accept' on a given name change '''
     if not request.user.is_staff:
         raise Http404
 
diff --git a/templates/profile.html b/templates/profile.html
index 9c76ac9b2c..095b32677e 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -208,9 +208,9 @@ $(function() {
         <input type="submit" id="pwd_reset_button" value="Reset Password" />
       </div>
 
-      <div id="unenroll">
+      <!--div id="unenroll">
         <a href="#unenroll_course" rel="leanModal">Unenroll from 6.002x</a>
-      </div>
+      </div-->
     </section>
   </div>
 </section>