Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-14 10:00:16 -04:00
parent 40e7cab8fb df3d6e3b06
commit 7e55d5eb5c
4 changed files with 5 additions and 2 deletions
--- a/lms/djangoapps/dashboard/views.py
+++ b/lms/djangoapps/dashboard/views.py
@@ -56,7 +56,7 @@ def dashboard(request):
    # table queries need not take the form of raw SQL, but do in this case since
    # the MySQL backend for django isn't very friendly with group by or distinct
    table_queries = {}
-    table_queries["course enrollments"] = """
+    table_queries["course registrations (current enrollments)"] = """
        select
        course_id as Course,
        count(user_id) as Students