From 1cd94cf5e50abb0efb5319099164e4755c9e42f1 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Sat, 24 May 2014 19:22:42 -0400 Subject: [PATCH] Remove gradebook code from legacy.py (moved to instructor/views/api.py) --- lms/djangoapps/instructor/views/legacy.py | 37 +------------------ .../courseware/instructor_dashboard.html | 2 +- lms/urls.py | 2 - 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py index 933f3e4d67..df23eb3154 100644 --- a/lms/djangoapps/instructor/views/legacy.py +++ b/lms/djangoapps/instructor/views/legacy.py @@ -1423,42 +1423,7 @@ def get_student_grade_summary_data(request, course, get_grades=True, get_raw_sco #----------------------------------------------------------------------------- - -@cache_control(no_cache=True, no_store=True, must_revalidate=True) -def gradebook(request, course_id): - """ - Show the gradebook for this course: - - only displayed to course staff - - shows students who are enrolled. - """ - course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id) - course = get_course_with_access(request.user, 'staff', course_key, depth=None) - - enrolled_students = User.objects.filter( - courseenrollment__course_id=course_key, - courseenrollment__is_active=1 - ).order_by('username').select_related("profile") - - # TODO (vshnayder): implement pagination. - enrolled_students = enrolled_students[:1000] # HACK! - - student_info = [{'username': student.username, - 'id': student.id, - 'email': student.email, - 'grade_summary': student_grades(student, request, course), - 'realname': student.profile.name, - } - for student in enrolled_students] - - return render_to_response('courseware/gradebook.html', { - 'students': student_info, - 'course': course, - 'course_id': course_key, - # Checked above - 'staff_access': True, - 'ordered_grades': sorted(course.grade_cutoffs.items(), key=lambda i: i[1], reverse=True), - }) - +# Gradebook has moved to instructor.api.spoc_gradebook # @cache_control(no_cache=True, no_store=True, must_revalidate=True) def grade_summary(request, course_key): diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html index 2c3e0bd045..c516a23dff 100644 --- a/lms/templates/courseware/instructor_dashboard.html +++ b/lms/templates/courseware/instructor_dashboard.html @@ -204,7 +204,7 @@ function goto( mode) % endif

- ${_("Gradebook")} + ${_("Gradebook")}

diff --git a/lms/urls.py b/lms/urls.py index 3c28984657..72e34e002b 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -365,8 +365,6 @@ if settings.COURSEWARE_ENABLED: if settings.COURSEWARE_ENABLED and settings.FEATURES.get('ENABLE_INSTRUCTOR_LEGACY_DASHBOARD'): urlpatterns += ( - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/legacy_gradebook$', - 'instructor.views.legacy.gradebook', name='gradebook_legacy'), url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/legacy_grade_summary$', 'instructor.views.legacy.grade_summary', name='grade_summary_legacy'), url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/legacy_instructor_dash$',