'
# If this fails, it is likely because ENABLE_INSTRUCTOR_EMAIL is set to False
diff --git a/lms/djangoapps/bulk_email/tests/test_email.py b/lms/djangoapps/bulk_email/tests/test_email.py
index 9a85bd2ba5..7bb2b827d9 100644
--- a/lms/djangoapps/bulk_email/tests/test_email.py
+++ b/lms/djangoapps/bulk_email/tests/test_email.py
@@ -53,7 +53,7 @@ class EmailSendFromDashboardTestCase(ModuleStoreTestCase):
def setUp(self):
super(EmailSendFromDashboardTestCase, self).setUp()
course_title = u"ẗëṡẗ title ｲ乇丂ｲ ﾶ乇丂丂ﾑg乇 ｷo尺 ﾑﾚﾚ тэѕт мэѕѕаБэ"
- self.course = CourseFactory.create(display_name=course_title)
+ self.course = CourseFactory.create(display_name=course_title, run="1T2015")
self.instructor = InstructorFactory(course_key=self.course.id)
@@ -75,6 +75,7 @@ class EmailSendFromDashboardTestCase(ModuleStoreTestCase):
self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
# Response loads the whole instructor dashboard, so no need to explicitly
# navigate to a particular email section
+ self.grant_sudo_access(unicode(self.course.id), 'test')
response = self.client.get(self.url)
email_section = '
'
# If this fails, it is likely because ENABLE_INSTRUCTOR_EMAIL is set to False
diff --git a/lms/djangoapps/bulk_email/tests/test_err_handling.py b/lms/djangoapps/bulk_email/tests/test_err_handling.py
index 9b8db791d9..a2457051df 100644
--- a/lms/djangoapps/bulk_email/tests/test_err_handling.py
+++ b/lms/djangoapps/bulk_email/tests/test_err_handling.py
@@ -47,9 +47,10 @@ class TestEmailErrors(ModuleStoreTestCase):
def setUp(self):
super(TestEmailErrors, self).setUp()
course_title = u"ẗëṡẗ title ｲ乇丂ｲ ﾶ乇丂丂ﾑg乇 ｷo尺 ﾑﾚﾚ тэѕт мэѕѕаБэ"
- self.course = CourseFactory.create(display_name=course_title)
+ self.course = CourseFactory.create(display_name=course_title, run="1T2015")
self.instructor = AdminFactory.create()
self.client.login(username=self.instructor.username, password="test")
+ self.grant_sudo_access(unicode(self.course.id), 'test')
# load initial content (since we don't run migrations as part of tests):
call_command("loaddata", "course_email_template.json")
diff --git a/lms/djangoapps/courseware/admin.py b/lms/djangoapps/courseware/admin.py
index 78c9fc826f..16843ba22d 100644
--- a/lms/djangoapps/courseware/admin.py
+++ b/lms/djangoapps/courseware/admin.py
@@ -3,7 +3,7 @@ django admin pages for courseware model
'''
from courseware.models import StudentModule, OfflineComputedGrade, OfflineComputedGradeLog
-from ratelimitbackend import admin
+from django.contrib import admin
admin.site.register(StudentModule)
diff --git a/lms/djangoapps/courseware/features/lti.feature b/lms/djangoapps/courseware/features/lti.feature
index 3ac9564f7a..c3d6c2f643 100644
--- a/lms/djangoapps/courseware/features/lti.feature
+++ b/lms/djangoapps/courseware/features/lti.feature
@@ -51,6 +51,7 @@ Feature: LMS.LTI component
Then I see text "Problem Scores: 5/10"
And I see graph with total progress "5%"
Then I click on the "Instructor" tab
+ Then I get sudo access with password "test"
And I click on the "Student Admin" tab
And I click on the "View Gradebook" link
And I see in the gradebook table that "HW" is "50"
@@ -90,6 +91,7 @@ Feature: LMS.LTI component
Then I see text "Problem Scores: 8/10"
And I see graph with total progress "8%"
Then I click on the "Instructor" tab
+ Then I get sudo access with password "test"
And I click on the "Student Admin" tab
And I click on the "View Gradebook" link
And I see in the gradebook table that "HW" is "80"
@@ -116,6 +118,7 @@ Feature: LMS.LTI component
Then I see text "Problem Scores: 0/10"
And I see graph with total progress "0%"
Then I click on the "Instructor" tab
+ Then I get sudo access with password "test"
And I click on the "Student Admin" tab
And I click on the "View Gradebook" link
And I see in the gradebook table that "HW" is "0"
diff --git a/lms/djangoapps/courseware/features/staff_debug_info.feature b/lms/djangoapps/courseware/features/staff_debug_info.feature
deleted file mode 100644
index 519e4b3c13..0000000000
--- a/lms/djangoapps/courseware/features/staff_debug_info.feature
+++ /dev/null
@@ -1,13 +0,0 @@
-@shard_1
-Feature: LMS.Debug staff info links
- As a course staff in an edX course
- In order to test my understanding of the material
- I want to click on staff debug info links
-
- Scenario: I can reset student attempts
- When i am staff member for the course "model_course"
- And I am viewing a "multiple choice" problem
- And I can view staff debug info
- Then I can reset student attempts
- Then I cannot see delete student state link
- Then I cannot see rescore student submission link
diff --git a/lms/djangoapps/courseware/features/staff_debug_info.py b/lms/djangoapps/courseware/features/staff_debug_info.py
deleted file mode 100644
index 9d183a5be9..0000000000
--- a/lms/djangoapps/courseware/features/staff_debug_info.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-Steps for staff_debug_info.feature lettuce tests
-"""
-
-from django.contrib.auth.models import User
-from lettuce import world, step
-from common import create_course, course_id
-from courseware.courses import get_course_by_id
-from instructor.access import allow_access
-
-
-@step(u'i am staff member for the course "([^"]*)"$')
-def i_am_staff_member_for_the_course(step, course_number):
- # Create the course
- create_course(step, course_number)
- course = get_course_by_id(course_id(course_number))
-
- # Create the user
- world.create_user('robot', 'test')
- user = User.objects.get(username='robot')
-
- # Add user as a course staff.
- allow_access(course, user, "staff")
-
- world.log_in(username='robot', password='test')
-
-
-@step(u'I can view staff debug info')
-def view_staff_debug_info(step):
- css_selector = "a.instructor-info-action"
- world.css_click(css_selector)
- world.wait_for_visible("section.staff-modal")
-
-
-@step(u'I can reset student attempts')
-def view_staff_debug_info(step):
- css_selector = "a.staff-debug-reset"
- world.css_click(css_selector)
- world.wait_for_ajax_complete()
-
-
-@step(u'I cannot see delete student state link')
-def view_staff_debug_info(step):
- css_selector = "a.staff-debug-sdelete"
- world.is_css_not_present(css_selector)
-
-
-@step(u'I cannot see rescore student submission link')
-def view_staff_debug_info(step):
- css_selector = "a.staff-debug-rescore"
- world.is_css_not_present(css_selector)
diff --git a/lms/djangoapps/courseware/tests/test_entrance_exam.py b/lms/djangoapps/courseware/tests/test_entrance_exam.py
index 46dbe5413d..504e366ea9 100644
--- a/lms/djangoapps/courseware/tests/test_entrance_exam.py
+++ b/lms/djangoapps/courseware/tests/test_entrance_exam.py
@@ -386,6 +386,7 @@ class EntranceExamTestCases(LoginEnrollmentTestCase, ModuleStoreTestCase):
# hit skip entrance exam api in instructor app
instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse('mark_student_can_skip_entrance_exam', kwargs={'course_id': unicode(self.course.id)})
response = self.client.post(url, {
'unique_student_identifier': self.request.user.email,
diff --git a/lms/djangoapps/courseware/tests/test_tabs.py b/lms/djangoapps/courseware/tests/test_tabs.py
index b50d4d793a..828b03d8ed 100644
--- a/lms/djangoapps/courseware/tests/test_tabs.py
+++ b/lms/djangoapps/courseware/tests/test_tabs.py
@@ -383,6 +383,7 @@ class EntranceExamsTabsTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase):
instructor = InstructorFactory(course_key=self.course.id)
self.client.logout()
self.client.login(username=instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse('mark_student_can_skip_entrance_exam', kwargs={'course_id': unicode(self.course.id)})
response = self.client.post(url, {
diff --git a/lms/djangoapps/courseware/tests/test_view_authentication.py b/lms/djangoapps/courseware/tests/test_view_authentication.py
index 52cf037a9e..a1609b62b8 100644
--- a/lms/djangoapps/courseware/tests/test_view_authentication.py
+++ b/lms/djangoapps/courseware/tests/test_view_authentication.py
@@ -67,6 +67,7 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
'book_index': index})
for index, __ in enumerate(course.textbooks)
])
+ self.grant_sudo_access(unicode(course.id), 'test')
for url in urls:
self.assert_request_status_code(404, url)
@@ -81,6 +82,7 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
'book_index': index})
for index in xrange(len(course.textbooks))
])
+ self.grant_sudo_access(unicode(course.id), 'test')
for url in urls:
self.assert_request_status_code(200, url)
@@ -207,6 +209,8 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
urls = [reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()}),
reverse('instructor_dashboard', kwargs={'course_id': self.test_course.id.to_deprecated_string()})]
+ self.grant_sudo_access(unicode(self.course.id), 'test')
+ self.grant_sudo_access(unicode(self.test_course.id), 'test')
# Shouldn't be able to get to the instructor pages
for url in urls:
self.assert_request_status_code(404, url)
@@ -218,6 +222,8 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
"""
self.login(self.staff_user)
+ self.grant_sudo_access(unicode(self.course.id), 'test')
+ self.grant_sudo_access(unicode(self.test_course.id), 'test')
# Now should be able to get to self.course, but not self.test_course
url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
self.assert_request_status_code(200, url)
@@ -232,6 +238,8 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
"""
self.login(self.instructor_user)
+ self.grant_sudo_access(unicode(self.course.id), 'test')
+ self.grant_sudo_access(unicode(self.test_course.id), 'test')
# Now should be able to get to self.course, but not self.test_course
url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
self.assert_request_status_code(200, url)
@@ -245,6 +253,9 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
and student profile pages for course in their org.
"""
self.login(self.org_staff_user)
+ self.grant_sudo_access(unicode(self.course.id), 'test')
+ self.grant_sudo_access(unicode(self.test_course.id), 'test')
+ self.grant_sudo_access(unicode(self.other_org_course.id), 'test')
url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
self.assert_request_status_code(200, url)
@@ -260,6 +271,9 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
and student profile pages for course in their org.
"""
self.login(self.org_instructor_user)
+ self.grant_sudo_access(unicode(self.course.id), 'test')
+ self.grant_sudo_access(unicode(self.test_course.id), 'test')
+ self.grant_sudo_access(unicode(self.other_org_course.id), 'test')
url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
self.assert_request_status_code(200, url)
@@ -275,6 +289,8 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
"""
self.login(self.global_staff_user)
+ self.grant_sudo_access(unicode(self.course.id), 'test')
+ self.grant_sudo_access(unicode(self.test_course.id), 'test')
# and now should be able to load both
urls = [reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()}),
reverse('instructor_dashboard', kwargs={'course_id': self.test_course.id.to_deprecated_string()})]
@@ -387,6 +403,26 @@ class TestViewAuth(ModuleStoreTestCase, LoginEnrollmentTestCase):
self.login(self.global_staff_user)
self.assertTrue(self.enroll(self.course))
+ def test_org_instructor_cannot_access_without_sudo(self):
+ """
+ Test that org instructor cannot load the instructor dashboard without sudo access
+ and it redirect org instructor to sudo password page.
+ """
+ self.login(self.org_instructor_user)
+ url = reverse('instructor_dashboard', kwargs={'course_id': unicode(self.course.id)})
+ response = self.assert_request_status_code(401, url)
+ self.assertIn('Unauthorized', response.content)
+
+ def test_org_staff_cannot_access_without_sudo(self):
+ """
+ Test that org staff cannot load the instructor dashboard without sudo access
+ and it redirect org staff to sudo password page.
+ """
+ self.login(self.org_staff_user)
+ url = reverse('instructor_dashboard', kwargs={'course_id': unicode(self.course.id)})
+ response = self.assert_request_status_code(401, url)
+ self.assertIn('Unauthorized', response.content)
+
@attr('shard_1')
class TestBetatesterAccess(ModuleStoreTestCase, CourseAccessTestMixin):
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 8dbfcb42d0..9a75eb633b 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -32,6 +32,7 @@ from course_modes.models import CourseMode
from courseware.testutils import RenderXBlockTestMixin
from courseware.tests.factories import StudentModuleFactory
from edxmako.tests import mako_middleware_process_request
+from django_sudo_helpers.tests.utils import sudo_middleware_process_request
from student.models import CourseEnrollment
from student.tests.factories import AdminFactory, UserFactory, CourseEnrollmentFactory
from util.tests.test_date_utils import fake_ugettext, fake_pgettext
@@ -1152,6 +1153,7 @@ class TestIndexView(ModuleStoreTestCase):
)
request.user = user
mako_middleware_process_request(request)
+ sudo_middleware_process_request(request)
# Trigger the assertions embedded in the ViewCheckerBlocks
response = views.index(request, unicode(course.id), chapter=chapter.url_name, section=section.url_name)
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 403d47a2d9..9a0b7b6a7f 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -25,6 +25,7 @@ from django.shortcuts import redirect
from certificates import api as certs_api
from edxmako.shortcuts import render_to_response, render_to_string, marketing_link
from django.views.decorators.csrf import ensure_csrf_cookie
+from sudo.utils import revoke_sudo_privileges
from django.views.decorators.cache import cache_control
from django.db import transaction
from markupsafe import escape
@@ -340,6 +341,10 @@ def index(request, course_id, chapter=None, section=None,
- HTTPresponse
"""
+ # Revoke sudo privileges from a request explicitly
+ if request.is_sudo(region=course_id):
+ revoke_sudo_privileges(request, region=course_id)
+
course_key = CourseKey.from_string(course_id)
user = User.objects.prefetch_related("groups").get(id=request.user.id)
diff --git a/lms/djangoapps/instructor/features/bulk_email.feature b/lms/djangoapps/instructor/features/bulk_email.feature
index 39d2c00c83..b1766bf9ca 100644
--- a/lms/djangoapps/instructor/features/bulk_email.feature
+++ b/lms/djangoapps/instructor/features/bulk_email.feature
@@ -7,6 +7,8 @@ Feature: LMS.Instructor Dash Bulk Email
Scenario: Send bulk email
Given there is a course with a staff, instructor and student
And I am logged in to the course as "
"
+ Then I go to instructor tab
+ Then I get sudo access with password "test"
When I send email to ""
Then Email is sent to ""
diff --git a/lms/djangoapps/instructor/features/bulk_email.py b/lms/djangoapps/instructor/features/bulk_email.py
index 90eed1ebd9..81c11ea35e 100644
--- a/lms/djangoapps/instructor/features/bulk_email.py
+++ b/lms/djangoapps/instructor/features/bulk_email.py
@@ -96,6 +96,13 @@ def log_into_the_course(step, role): # pylint: disable=unused-argument
world.expected_addresses['myself'] = [my_email]
+@step("I go to instructor tab")
+def i_got_to_instructor_tab(step): # pylint: disable=unused-argument
+ url = '/courses/{}'.format(world.bulk_email_course_key)
+ world.visit(url)
+ world.css_click('a[href="{}/instructor"]'.format(url))
+
+
@step(u'I send email to "([^"]*)"')
def when_i_send_an_email(step, recipient): # pylint: disable=unused-argument
@@ -115,9 +122,6 @@ def when_i_send_an_email(step, recipient): # pylint: disable=unused-argument
call_command('loaddata', 'course_email_template.json')
# Go to the email section of the instructor dash
- url = '/courses/{}'.format(world.bulk_email_course_key)
- world.visit(url)
- world.css_click('a[href="{}/instructor"]'.format(url))
world.css_click('a[data-section="send_email"]')
# Select the recipient
diff --git a/lms/djangoapps/instructor/features/common.py b/lms/djangoapps/instructor/features/common.py
index 27e15d7aca..d71a2edf9c 100644
--- a/lms/djangoapps/instructor/features/common.py
+++ b/lms/djangoapps/instructor/features/common.py
@@ -12,6 +12,7 @@ from mock import patch
from nose.tools import assert_in # pylint: disable=no-name-in-module
from courseware.tests.factories import StaffFactory, InstructorFactory
+from terrain.steps import i_get_sudo_access
@step(u'Given I am "([^"]*)" for a very large course')
@@ -71,11 +72,17 @@ def i_am_staff_or_instructor(step, role): # pylint: disable=unused-argument
)
-def go_to_section(section_name):
+def go_to_instructor_tab(step):
# section name should be one of
# course_info, membership, student_admin, data_download, analytics, send_email
world.visit(u'/courses/{}'.format(world.course_key))
world.css_click(u'a[href="/courses/{}/instructor"]'.format(world.course_key))
+ i_get_sudo_access(step, 'test')
+
+
+def go_to_section(section_name):
+ # section name should be one of
+ # course_info, membership, student_admin, data_download, analytics, send_email
world.css_click('a[data-section="{0}"]'.format(section_name))
@@ -84,6 +91,7 @@ def click_a_button(step, button): # pylint: disable=unused-argument
if button == "Generate Grade Report":
# Go to the data download section of the instructor dash
+ go_to_instructor_tab(step)
go_to_section("data_download")
# Click generate grade report button
@@ -101,18 +109,21 @@ def click_a_button(step, button): # pylint: disable=unused-argument
elif button == "Grading Configuration":
# Go to the data download section of the instructor dash
+ go_to_instructor_tab(step)
go_to_section("data_download")
world.css_click('input[name="dump-gradeconf"]')
elif button == "List enrolled students' profile information":
# Go to the data download section of the instructor dash
+ go_to_instructor_tab(step)
go_to_section("data_download")
world.css_click('input[name="list-profiles"]')
elif button == "Download profile information as a CSV":
# Go to the data download section of the instructor dash
+ go_to_instructor_tab(step)
go_to_section("data_download")
world.css_click('input[name="list-profiles-csv"]')
@@ -132,4 +143,5 @@ def click_a_button(step, tab_name): # pylint: disable=unused-argument
'Analytics': 'analytics',
'Email': 'send_email',
}
+ go_to_instructor_tab(step)
go_to_section(tab_name_dict[tab_name])
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index e5d7ec3aec..523f965037 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -283,6 +283,7 @@ class TestInstructorAPIDenyLevels(ModuleStoreTestCase, LoginEnrollmentTestCase):
CourseEnrollment.enroll(staff_member, self.course.id)
CourseFinanceAdminRole(self.course.id).add_users(staff_member)
self.client.login(username=staff_member.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
# Try to promote to forums admin - not working
# update_forum_role(self.course.id, staff_member, FORUM_ROLE_ADMINISTRATOR, 'allow')
@@ -305,6 +306,23 @@ class TestInstructorAPIDenyLevels(ModuleStoreTestCase, LoginEnrollmentTestCase):
"Staff member should not be allowed to access endpoint " + endpoint
)
+ def test_staff_level_without_sudo_access(self):
+ """
+ Ensure that a staff member redirected to sudo password page without sudo access.
+ """
+ staff_member = StaffFactory(course_key=self.course.id)
+ CourseEnrollment.enroll(staff_member, self.course.id)
+ CourseFinanceAdminRole(self.course.id).add_users(staff_member)
+ self.client.login(username=staff_member.username, password='test')
+
+ for endpoint, args in self.staff_level_endpoints:
+ self._access_endpoint(
+ endpoint,
+ args,
+ 401,
+ ""
+ )
+
def test_instructor_level(self):
"""
Ensure that an instructor member can access all endpoints.
@@ -314,6 +332,7 @@ class TestInstructorAPIDenyLevels(ModuleStoreTestCase, LoginEnrollmentTestCase):
CourseFinanceAdminRole(self.course.id).add_users(inst)
self.client.login(username=inst.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
for endpoint, args in self.staff_level_endpoints:
# TODO: make these work
@@ -337,6 +356,31 @@ class TestInstructorAPIDenyLevels(ModuleStoreTestCase, LoginEnrollmentTestCase):
"Instructor should be allowed to access endpoint " + endpoint
)
+ def test_instructor_level_without_sudo_access(self):
+ """
+ Ensure that an instructor member redirected to sudo password page without sudo access.
+ """
+ inst = InstructorFactory(course_key=self.course.id)
+ CourseEnrollment.enroll(inst, self.course.id)
+ CourseFinanceAdminRole(self.course.id).add_users(inst)
+ self.client.login(username=inst.username, password='test')
+
+ for endpoint, args in self.staff_level_endpoints:
+ self._access_endpoint(
+ endpoint,
+ args,
+ 401,
+ ""
+ )
+
+ for endpoint, args in self.instructor_level_endpoints:
+ self._access_endpoint(
+ endpoint,
+ args,
+ 401,
+ ""
+ )
+
@attr('shard_1')
@patch.dict(settings.FEATURES, {'ALLOW_AUTOMATED_SIGNUPS': True})
@@ -351,6 +395,7 @@ class TestInstructorAPIBulkAccountCreationAndEnrollment(ModuleStoreTestCase, Log
self.course = CourseFactory.create()
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.url = reverse('register_and_enroll_students', kwargs={'course_id': self.course.id.to_deprecated_string()})
self.not_enrolled_student = UserFactory(
@@ -655,6 +700,7 @@ class TestInstructorAPIEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase):
self.course = CourseFactory.create()
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.enrolled_student = UserFactory(username='EnrolledStudent', first_name='Enrolled', last_name='Student')
CourseEnrollment.enroll(
@@ -1231,6 +1277,7 @@ class TestInstructorAPIEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase):
manually enrolling the students for the paid courses.
"""
paid_course = self.create_paid_course()
+ self.grant_sudo_access(unicode(paid_course.id), 'test')
url = reverse('students_update_enrollment', kwargs={'course_id': paid_course.id.to_deprecated_string()})
params = {'identifiers': self.notregistered_email, 'action': 'enroll', 'email_students': False,
'auto_enroll': False}
@@ -1256,6 +1303,7 @@ class TestInstructorAPIEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase):
test to unenroll allow to enroll user.
"""
paid_course = self.create_paid_course()
+ self.grant_sudo_access(unicode(paid_course.id), 'test')
url = reverse('students_update_enrollment', kwargs={'course_id': paid_course.id.to_deprecated_string()})
params = {'identifiers': self.notregistered_email, 'action': 'enroll', 'email_students': False,
'auto_enroll': False, 'reason': 'testing..'}
@@ -1306,6 +1354,7 @@ class TestInstructorAPIEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase):
test unenrolled user already not enrolled in a course.
"""
paid_course = self.create_paid_course()
+ self.grant_sudo_access(unicode(paid_course.id), 'test')
course_enrollment = CourseEnrollment.objects.filter(
user__email=self.notregistered_email, course_id=paid_course.id
)
@@ -1403,6 +1452,7 @@ class TestInstructorAPIBulkBetaEnrollment(ModuleStoreTestCase, LoginEnrollmentTe
self.course = CourseFactory.create()
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.beta_tester = BetaTesterFactory(course_key=self.course.id)
CourseEnrollment.enroll(
@@ -1731,6 +1781,7 @@ class TestInstructorAPILevelsAccess(ModuleStoreTestCase, LoginEnrollmentTestCase
self.course = CourseFactory.create()
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.other_instructor = InstructorFactory(course_key=self.course.id)
self.other_staff = StaffFactory(course_key=self.course.id)
@@ -1969,6 +2020,7 @@ class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCa
self.course_mode.save()
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.cart = Order.get_cart_for_user(self.instructor)
self.coupon_code = 'abcde'
self.coupon = Coupon(code=self.coupon_code, description='testing code', course_id=self.course.id,
@@ -2396,6 +2448,7 @@ class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCa
UserProfileFactory.create(user=self.students[0], meta='{"company": "asdasda"}')
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse('get_enrollment_report', kwargs={'course_id': self.course.id.to_deprecated_string()})
response = self.client.get(url, {})
self.assertIn('Your detailed enrollment report is being generated!', response.content)
@@ -2445,6 +2498,7 @@ class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCa
CourseFinanceAdminRole(self.course.id).add_users(self.instructor)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse('get_enrollment_report', kwargs={'course_id': self.course.id.to_deprecated_string()})
response = self.client.get(url, {})
@@ -2467,6 +2521,7 @@ class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCa
CourseFinanceAdminRole(self.course.id).add_users(self.instructor)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse('get_enrollment_report', kwargs={'course_id': self.course.id.to_deprecated_string()})
response = self.client.get(url, {})
@@ -2492,6 +2547,7 @@ class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCa
CourseFinanceAdminRole(self.course.id).add_users(self.instructor)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse('get_enrollment_report', kwargs={'course_id': self.course.id.to_deprecated_string()})
response = self.client.get(url, {})
@@ -2649,6 +2705,7 @@ class TestInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollmentTestCase)
self.course = CourseFactory.create()
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.student = UserFactory()
CourseEnrollment.enroll(self.student, self.course.id)
@@ -2818,6 +2875,8 @@ class TestEntranceExamInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollm
# Add instructor to invalid ee course
CourseInstructorRole(self.course_with_invalid_ee.id).add_users(self.instructor)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course_with_invalid_ee.id), 'test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.student = UserFactory()
CourseEnrollment.enroll(self.student, self.course.id)
@@ -2927,6 +2986,7 @@ class TestEntranceExamInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollm
self.client.logout()
staff_user = StaffFactory(course_key=self.course.id)
self.client.login(username=staff_user.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse('reset_student_attempts_for_entrance_exam',
kwargs={'course_id': unicode(self.course.id)})
response = self.client.get(url, {
@@ -3057,6 +3117,7 @@ class TestInstructorSendEmail(ModuleStoreTestCase, LoginEnrollmentTestCase):
self.course = CourseFactory.create()
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
test_subject = u'\u1234 test subject'
test_message = u'\u6824 test message'
self.full_test_message = {
@@ -3182,6 +3243,7 @@ class TestInstructorAPITaskLists(ModuleStoreTestCase, LoginEnrollmentTestCase):
)
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.student = UserFactory()
CourseEnrollment.enroll(self.student, self.course.id)
@@ -3298,6 +3360,7 @@ class TestInstructorEmailContentList(ModuleStoreTestCase, LoginEnrollmentTestCas
self.course = CourseFactory.create()
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.tasks = {}
self.emails = {}
self.emails_info = {}
@@ -3552,6 +3615,7 @@ class TestDueDateExtensions(ModuleStoreTestCase, LoginEnrollmentTestCase):
self.instructor = InstructorFactory(course_key=course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
def test_change_due_date(self):
url = reverse('change_due_date', kwargs={'course_id': self.course.id.to_deprecated_string()})
@@ -3676,6 +3740,7 @@ class TestCourseRegistrationCodes(ModuleStoreTestCase):
CourseModeFactory.create(course_id=self.course.id, min_price=50)
self.instructor = InstructorFactory(course_key=self.course.id)
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
CourseSalesAdminRole(self.course.id).add_users(self.instructor)
url = reverse('generate_registration_codes',
@@ -4151,6 +4216,7 @@ class TestBulkCohorting(ModuleStoreTestCase):
Verify that we get the error we expect for a given file input.
"""
self.client.login(username=self.staff_user.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
response = self.call_add_users_to_cohorts(file_content, suffix=file_suffix)
self.assertEqual(response.status_code, 400)
result = json.loads(response.content)
@@ -4164,6 +4230,7 @@ class TestBulkCohorting(ModuleStoreTestCase):
"""
mock_store_upload.return_value = (None, 'fake_file_name.csv')
self.client.login(username=self.staff_user.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
response = self.call_add_users_to_cohorts(file_content)
self.assertEqual(response.status_code, 204)
self.assertTrue(mock_store_upload.called)
diff --git a/lms/djangoapps/instructor/tests/test_api_email_localization.py b/lms/djangoapps/instructor/tests/test_api_email_localization.py
index d9fd87df93..5f70efd271 100644
--- a/lms/djangoapps/instructor/tests/test_api_email_localization.py
+++ b/lms/djangoapps/instructor/tests/test_api_email_localization.py
@@ -33,6 +33,7 @@ class TestInstructorAPIEnrollmentEmailLocalization(ModuleStoreTestCase):
self.instructor = InstructorFactory(course_key=self.course.id)
set_user_preference(self.instructor, LANGUAGE_KEY, 'zh-cn')
self.client.login(username=self.instructor.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
self.student = UserFactory.create()
set_user_preference(self.student, LANGUAGE_KEY, 'fr')
diff --git a/lms/djangoapps/instructor/tests/test_certificates.py b/lms/djangoapps/instructor/tests/test_certificates.py
index 84cae88433..6362d92165 100644
--- a/lms/djangoapps/instructor/tests/test_certificates.py
+++ b/lms/djangoapps/instructor/tests/test_certificates.py
@@ -96,6 +96,7 @@ class CertificatesInstructorDashTest(ModuleStoreTestCase):
def _assert_certificates_visible(self, is_visible):
"""Check that the certificates section is visible on the instructor dash. """
+ self.grant_sudo_access(unicode(self.course.id), 'test')
response = self.client.get(self.url)
if is_visible:
self.assertContains(response, "Certificates")
@@ -122,6 +123,7 @@ class CertificatesInstructorDashTest(ModuleStoreTestCase):
def _assert_certificate_status(self, cert_name, expected_status):
"""Check the certificate status display on the instructor dash. """
+ self.grant_sudo_access(unicode(self.course.id), 'test')
response = self.client.get(self.url)
if expected_status == 'started':
@@ -138,6 +140,7 @@ class CertificatesInstructorDashTest(ModuleStoreTestCase):
def _assert_enable_certs_button_is_disabled(self):
"""Check that the "enable student-generated certificates" button is disabled. """
+ self.grant_sudo_access(unicode(self.course.id), 'test')
response = self.client.get(self.url)
expected_html = ''
self.assertContains(response, expected_html)
@@ -179,11 +182,13 @@ class CertificatesInstructorApiTest(ModuleStoreTestCase):
# Global staff have access
self.client.login(username=self.global_staff.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
response = self.client.post(url)
self.assertEqual(response.status_code, 302)
def test_generate_example_certificates(self):
self.client.login(username=self.global_staff.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse(
'generate_example_certificates',
kwargs={'course_id': unicode(self.course.id)}
@@ -202,6 +207,7 @@ class CertificatesInstructorApiTest(ModuleStoreTestCase):
@ddt.data(True, False)
def test_enable_certificate_generation(self, is_enabled):
self.client.login(username=self.global_staff.username, password='test')
+ self.grant_sudo_access(unicode(self.course.id), 'test')
url = reverse(
'enable_certificate_generation',
kwargs={'course_id': unicode(self.course.id)}
diff --git a/lms/djangoapps/instructor/tests/test_ecommerce.py b/lms/djangoapps/instructor/tests/test_ecommerce.py
index 7fb4f895ac..24bf4b6861 100644
--- a/lms/djangoapps/instructor/tests/test_ecommerce.py
+++ b/lms/djangoapps/instructor/tests/test_ecommerce.py
@@ -29,6 +29,7 @@ class TestECommerceDashboardViews(ModuleStoreTestCase):
# Create instructor account
self.instructor = AdminFactory.create()
self.client.login(username=self.instructor.username, password="test")
+ self.grant_sudo_access(unicode(self.course.id), "test")
mode = CourseMode(
course_id=self.course.id.to_deprecated_string(), mode_slug='honor',
mode_display_name='honor', min_price=10, currency='usd'
diff --git a/lms/djangoapps/instructor/tests/test_email.py b/lms/djangoapps/instructor/tests/test_email.py
index d18e9f403a..9aa7b9b0c1 100644
--- a/lms/djangoapps/instructor/tests/test_email.py
+++ b/lms/djangoapps/instructor/tests/test_email.py
@@ -29,6 +29,7 @@ class TestNewInstructorDashboardEmailViewMongoBacked(ModuleStoreTestCase):
# Create instructor account
instructor = AdminFactory.create()
self.client.login(username=instructor.username, password="test")
+ self.grant_sudo_access(unicode(self.course.id), "test")
# URL for instructor dash
self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
diff --git a/lms/djangoapps/instructor/tests/test_legacy_enrollment.py b/lms/djangoapps/instructor/tests/test_legacy_enrollment.py
index 314185bcdd..467a44de97 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_enrollment.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_enrollment.py
@@ -35,6 +35,8 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
self.course = CourseFactory.create()
+ self.grant_sudo_access(unicode(self.course.id), "test")
+
self.users = [
UserFactory.create(username="student%d" % i, email="student%d@test.com" % i)
for i in xrange(USER_COUNT)
@@ -52,7 +54,6 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
"""
course = self.course
-
# Run the Un-enroll students command
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
response = self.client.post(
diff --git a/lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py b/lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
index 4f7cfdf9ed..a3a9490cbd 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
@@ -44,6 +44,7 @@ class TestRawGradeCSV(TestSubmittingProblems):
"""
# Answer second problem correctly with 2nd user to expose bug
self.login(self.instructor, self.password)
+ self.grant_sudo_access(unicode(self.course.id), self.password)
resp = self.submit_question_answer('p2', {'2_1': 'Correct'})
self.assertEqual(resp.status_code, 200)
diff --git a/lms/djangoapps/instructor/tests/test_legacy_xss.py b/lms/djangoapps/instructor/tests/test_legacy_xss.py
index ff541ff69c..4d8ec5d741 100644
--- a/lms/djangoapps/instructor/tests/test_legacy_xss.py
+++ b/lms/djangoapps/instructor/tests/test_legacy_xss.py
@@ -52,9 +52,10 @@ class TestXss(ModuleStoreTestCase):
)
req.user = self._instructor
req.session = {}
+ req.is_sudo = lambda region=None: True
mako_middleware_process_request(req)
- resp = legacy.instructor_dashboard(req, self._course.id.to_deprecated_string())
+ resp = legacy.instructor_dashboard(request=req, course_id=self._course.id.to_deprecated_string())
respUnicode = resp.content.decode(settings.DEFAULT_CHARSET)
self.assertNotIn(self._evil_student.profile.name, respUnicode)
self.assertIn(escape(self._evil_student.profile.name), respUnicode)
diff --git a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
index 2e0ca99a73..0ccf42a00b 100644
--- a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
+++ b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
@@ -39,6 +39,7 @@ class TestGradebook(ModuleStoreTestCase):
kwargs['grading_policy'] = self.grading_policy
self.course = CourseFactory.create(**kwargs)
+ self.grant_sudo_access(unicode(self.course.id), 'test')
chapter = ItemFactory.create(
parent_location=self.course.location,
category="sequential",
diff --git a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
index 3694308b45..27e19953cf 100644
--- a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
+++ b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
@@ -43,6 +43,7 @@ class TestInstructorDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
# Create instructor account
self.instructor = AdminFactory.create()
self.client.login(username=self.instructor.username, password="test")
+ self.grant_sudo_access(unicode(self.course.id), 'test')
# URL for instructor dash
self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
@@ -202,6 +203,7 @@ class TestInstructorDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
student_cart.purchase()
self.client.login(username=self.instructor.username, password="test")
+ self.grant_sudo_access(unicode(self.course.id), 'test')
CourseFinanceAdminRole(self.course.id).add_users(self.instructor)
single_purchase_total = PaidCourseRegistration.get_total_amount_of_purchased_item(self.course.id)
bulk_purchase_total = CourseRegCodeItem.get_total_amount_of_purchased_item(self.course.id)
@@ -234,3 +236,13 @@ class TestInstructorDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase):
expected_result,
'CCX Coaches are able to create their own Custom Courses based on this course' in response.content
)
+
+ def test_sudo_required_on_dashboard(self):
+ """
+ Test that sudo_required redirect user to password page.
+ """
+ # Logout to remove sudo access.
+ self.client.logout()
+ self.client.login(username=self.instructor.username, password="test")
+ response = self.client.get(self.url, content_type='html', HTTP_ACCEPT='html')
+ self.assertEqual(response.status_code, 302)
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 6027525c94..a57572ce50 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -52,6 +52,7 @@ from django_comment_common.models import (
)
from edxmako.shortcuts import render_to_response, render_to_string
from courseware.models import StudentModule
+from django_sudo_helpers.decorators import sudo_required
from shoppingcart.models import (
Coupon,
CourseRegistrationCode,
@@ -317,6 +318,7 @@ COUNTRY_INDEX = 3
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def register_and_enroll_students(request, course_id): # pylint: disable=too-many-statements
"""
Create new account and Enroll students in this course.
@@ -517,6 +519,7 @@ def create_and_enroll_user(email, username, name, country, password, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_post_params(action="enroll or unenroll", identifiers="stringified list of emails and/or usernames")
+@sudo_required
def students_update_enrollment(request, course_id):
"""
Enroll or unenroll students by email.
@@ -684,6 +687,7 @@ def students_update_enrollment(request, course_id):
identifiers="stringified list of emails and/or usernames",
action="add or remove",
)
+@sudo_required
def bulk_beta_modify_access(request, course_id):
"""
Enroll or unenroll users in beta testing program.
@@ -765,6 +769,7 @@ def bulk_beta_modify_access(request, course_id):
rolename="'instructor', 'staff', 'beta', or 'ccx_coach'",
action="'allow' or 'revoke'"
)
+@sudo_required
def modify_access(request, course_id):
"""
Modify staff/instructor access of other user.
@@ -840,6 +845,7 @@ def modify_access(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('instructor')
@require_query_params(rolename="'instructor', 'staff', or 'beta'")
+@sudo_required
def list_course_role_members(request, course_id):
"""
List instructors and staff.
@@ -890,6 +896,7 @@ def list_course_role_members(request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def get_grading_config(request, course_id):
"""
Respond with json which contains a html formatted grade summary.
@@ -910,6 +917,7 @@ def get_grading_config(request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def get_sale_records(request, course_id, csv=False): # pylint: disable=unused-argument, redefined-outer-name
"""
return the summary of all sales records for a particular course
@@ -941,6 +949,7 @@ def get_sale_records(request, course_id, csv=False): # pylint: disable=unused-a
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def get_sale_order_records(request, course_id): # pylint: disable=unused-argument, redefined-outer-name
"""
return the summary of all sales records for a particular course
@@ -982,6 +991,7 @@ def get_sale_order_records(request, course_id): # pylint: disable=unused-argume
@require_level('staff')
@require_POST
+@sudo_required
def sale_validation(request, course_id):
"""
This method either invalidate or re validate the sale against the invoice number depending upon the event type
@@ -1047,6 +1057,7 @@ def re_validate_invoice(obj_invoice):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def get_students_features(request, course_id, csv=False): # pylint: disable=redefined-outer-name
"""
Respond with json which contains a summary of all enrolled students profile information.
@@ -1122,6 +1133,7 @@ def get_students_features(request, course_id, csv=False): # pylint: disable=red
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def get_students_who_may_enroll(request, course_id):
"""
Initiate generation of a CSV file containing information about
@@ -1153,6 +1165,7 @@ def get_students_who_may_enroll(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_POST
@require_level('staff')
+@sudo_required
def add_users_to_cohorts(request, course_id):
"""
View method that accepts an uploaded file (using key "uploaded-file")
@@ -1197,6 +1210,7 @@ def add_users_to_cohorts(request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def get_coupon_codes(request, course_id): # pylint: disable=unused-argument
"""
Respond with csv which contains a summary of all Active Coupons.
@@ -1226,6 +1240,7 @@ def get_coupon_codes(request, course_id): # pylint: disable=unused-argument
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
@require_finance_admin
def get_enrollment_report(request, course_id):
"""
@@ -1251,6 +1266,7 @@ def get_enrollment_report(request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
@require_finance_admin
def get_exec_summary_report(request, course_id):
"""
@@ -1350,6 +1366,7 @@ def random_code_generator():
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_POST
+@sudo_required
def get_registration_codes(request, course_id): # pylint: disable=unused-argument
"""
Respond with csv which contains a summary of all Registration Codes.
@@ -1553,6 +1570,7 @@ def generate_registration_codes(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_POST
+@sudo_required
def active_registration_codes(request, course_id): # pylint: disable=unused-argument
"""
Respond with csv which contains a summary of all Active Registration Codes.
@@ -1584,6 +1602,7 @@ def active_registration_codes(request, course_id): # pylint: disable=unused-arg
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_POST
+@sudo_required
def spent_registration_codes(request, course_id): # pylint: disable=unused-argument
"""
Respond with csv which contains a summary of all Spent(used) Registration Codes.
@@ -1614,6 +1633,7 @@ def spent_registration_codes(request, course_id): # pylint: disable=unused-argu
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def get_anon_ids(request, course_id): # pylint: disable=unused-argument
"""
Respond with 2-column CSV output of user-id, anonymized-user-id
@@ -1652,6 +1672,7 @@ def get_anon_ids(request, course_id): # pylint: disable=unused-argument
@require_query_params(
unique_student_identifier="email or username of student for whom to get progress url"
)
+@sudo_required
def get_student_progress_url(request, course_id):
"""
Get the progress url of a student.
@@ -1681,6 +1702,7 @@ def get_student_progress_url(request, course_id):
problem_to_reset="problem urlname to reset"
)
@common_exceptions_400
+@sudo_required
def reset_student_attempts(request, course_id):
"""
@@ -1759,6 +1781,7 @@ def reset_student_attempts(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@common_exceptions_400
+@sudo_required
def reset_student_attempts_for_entrance_exam(request, course_id): # pylint: disable=invalid-name
"""
@@ -1825,6 +1848,7 @@ def reset_student_attempts_for_entrance_exam(request, course_id): # pylint: dis
@require_level('instructor')
@require_query_params(problem_to_reset="problem urlname to reset")
@common_exceptions_400
+@sudo_required
def rescore_problem(request, course_id):
"""
Starts a background process a students attempts counter. Optionally deletes student state for a problem.
@@ -1879,6 +1903,7 @@ def rescore_problem(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('instructor')
@common_exceptions_400
+@sudo_required
def rescore_entrance_exam(request, course_id):
"""
Starts a background process a students attempts counter for entrance exam.
@@ -1930,6 +1955,7 @@ def rescore_entrance_exam(request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def list_background_email_tasks(request, course_id): # pylint: disable=unused-argument
"""
List background email tasks.
@@ -1948,6 +1974,7 @@ def list_background_email_tasks(request, course_id): # pylint: disable=unused-a
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def list_email_content(request, course_id): # pylint: disable=unused-argument
"""
List the content of bulk emails sent
@@ -1966,6 +1993,7 @@ def list_email_content(request, course_id): # pylint: disable=unused-argument
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def list_instructor_tasks(request, course_id):
"""
List instructor tasks.
@@ -2011,6 +2039,7 @@ def list_instructor_tasks(request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def list_entrance_exam_instructor_tasks(request, course_id): # pylint: disable=invalid-name
"""
List entrance exam related instructor tasks.
@@ -2045,6 +2074,7 @@ def list_entrance_exam_instructor_tasks(request, course_id): # pylint: disable=
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def list_report_downloads(_request, course_id):
"""
List grade CSV files that are available for download for this course.
@@ -2064,6 +2094,7 @@ def list_report_downloads(_request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
@require_finance_admin
def list_financial_report_downloads(_request, course_id):
"""
@@ -2084,6 +2115,7 @@ def list_financial_report_downloads(_request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def calculate_grades_csv(request, course_id):
"""
AlreadyRunningError is raised if the course's grades are already being updated.
@@ -2108,6 +2140,7 @@ def calculate_grades_csv(request, course_id):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def problem_grade_report(request, course_id):
"""
Request a CSV showing students' grades for all problems in the
@@ -2137,6 +2170,7 @@ def problem_grade_report(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_query_params('rolename')
+@sudo_required
def list_forum_members(request, course_id):
"""
Lists forum members of a certain rolename.
@@ -2199,6 +2233,7 @@ def list_forum_members(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_post_params(send_to="sending to whom", subject="subject line", message="message text")
+@sudo_required
def send_email(request, course_id):
"""
Send an email to self, staff, or everyone involved in a course.
@@ -2257,6 +2292,7 @@ def send_email(request, course_id):
action="'allow' or 'revoke'",
)
@common_exceptions_400
+@sudo_required
def update_forum_role_membership(request, course_id):
"""
Modify user's forum role.
@@ -2342,6 +2378,7 @@ def _display_unit(unit):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_query_params('student', 'url', 'due_datetime')
+@sudo_required
def change_due_date(request, course_id):
"""
Grants a due date extension to a student for a particular unit.
@@ -2363,6 +2400,7 @@ def change_due_date(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_query_params('student', 'url')
+@sudo_required
def reset_due_date(request, course_id):
"""
Rescinds a due date extension for a student on a particular unit.
@@ -2389,6 +2427,7 @@ def reset_due_date(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_query_params('url')
+@sudo_required
def show_unit_extensions(request, course_id):
"""
Shows all of the students which have due date extensions for the given unit.
@@ -2403,6 +2442,7 @@ def show_unit_extensions(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_query_params('student')
+@sudo_required
def show_student_extensions(request, course_id):
"""
Shows all of the due date extensions granted to a particular student in a
@@ -2489,6 +2529,7 @@ def enable_certificate_generation(request, course_id=None):
#---- Gradebook (shown to small courses only) ----
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
+@sudo_required
def spoc_gradebook(request, course_id):
"""
Show the gradebook for this course:
@@ -2530,6 +2571,7 @@ def spoc_gradebook(request, course_id):
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
@require_level('staff')
@require_POST
+@sudo_required
def mark_student_can_skip_entrance_exam(request, course_id): # pylint: disable=invalid-name
"""
Mark a student to skip entrance exam.
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 4339a7a7a8..c5f78ea90d 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -34,6 +34,7 @@ from courseware.courses import get_course_by_id, get_studio_url
from django_comment_client.utils import has_forum_access
from django_comment_common.models import FORUM_ROLE_ADMINISTRATOR
from student.models import CourseEnrollment
+from django_sudo_helpers.decorators import sudo_required
from shoppingcart.models import Coupon, PaidCourseRegistration, CourseRegCodeItem
from course_modes.models import CourseMode, CourseModesArchive
from student.roles import CourseFinanceAdminRole, CourseSalesAdminRole
@@ -65,8 +66,33 @@ class InstructorDashboardTab(CourseTab):
return user and has_access(user, 'staff', course, course.id)
+def check_staff_or_404():
+ """
+ Decorator with argument that requires an access level of the requesting
+ user. If the requirement is not satisfied, returns an
+ Http404 (404).
+
+ Assumes that request is in args[0].
+ Assumes that course_id is in kwargs['course_id'].
+ """
+
+ def decorator(func): # pylint: disable=missing-docstring
+ def wrapped(*args, **kwargs): # pylint: disable=missing-docstring
+ request = args[0]
+ course = get_course_by_id(CourseKey.from_string(kwargs['course_id']))
+ user_is_staff = has_access(request.user, "staff", course)
+ if user_is_staff:
+ return func(*args, **kwargs)
+ else:
+ raise Http404
+ return wrapped
+ return decorator
+
+
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@check_staff_or_404()
+@sudo_required
def instructor_dashboard_2(request, course_id):
""" Display the instructor dashboard for a course. """
try:
@@ -86,16 +112,16 @@ def instructor_dashboard_2(request, course_id):
'forum_admin': has_forum_access(request.user, course_key, FORUM_ROLE_ADMINISTRATOR),
}
- if not access['staff']:
- raise Http404()
-
is_white_label = CourseMode.is_white_label(course_key)
+ unique_student_identifier = request.GET.get("unique_student_identifier", "")
+ problem_to_reset = request.GET.get("problem_to_reset", "")
+
sections = [
_section_course_info(course, access),
_section_membership(course, access, is_white_label),
_section_cohort_management(course, access),
- _section_student_admin(course, access),
+ _section_student_admin(course, access, unique_student_identifier, problem_to_reset),
_section_data_download(course, access),
]
@@ -407,11 +433,21 @@ def _is_small_course(course_key):
return is_small_course
-def _section_student_admin(course, access):
+def _section_student_admin(course, access, unique_student_identifier, problem_to_reset):
""" Provide data for the corresponding dashboard section """
course_key = course.id
is_small_course = _is_small_course(course_key)
+ problem_url = None
+ if problem_to_reset:
+ problem_url = reverse(
+ 'jump_to',
+ kwargs={
+ 'course_id': unicode(course_key),
+ 'location': problem_to_reset
+ }
+ )
+
section_data = {
'section_key': 'student_admin',
'section_display_name': _('Student Admin'),
@@ -434,6 +470,9 @@ def _section_student_admin(course, access):
'list_entrace_exam_instructor_tasks_url': reverse('list_entrance_exam_instructor_tasks',
kwargs={'course_id': unicode(course_key)}),
'spoc_gradebook_url': reverse('spoc_gradebook', kwargs={'course_id': unicode(course_key)}),
+ 'unique_student_identifier': unique_student_identifier,
+ 'problem_to_reset': problem_to_reset,
+ 'problem_url': problem_url,
}
return section_data
diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py
index 173a36ae41..6e8ca50ac9 100644
--- a/lms/djangoapps/instructor/views/legacy.py
+++ b/lms/djangoapps/instructor/views/legacy.py
@@ -52,6 +52,7 @@ from student.models import (
CourseEnrollment,
CourseEnrollmentAllowed,
)
+from django_sudo_helpers.decorators import sudo_required
import track.views
from django.utils.translation import ugettext as _
@@ -79,6 +80,7 @@ def split_by_comma_and_whitespace(a_str):
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@sudo_required
def instructor_dashboard(request, course_id):
"""Display the instructor dashboard for a course."""
course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
diff --git a/lms/djangoapps/shoppingcart/admin.py b/lms/djangoapps/shoppingcart/admin.py
index fae033a849..7fa009ecd0 100644
--- a/lms/djangoapps/shoppingcart/admin.py
+++ b/lms/djangoapps/shoppingcart/admin.py
@@ -1,5 +1,5 @@
"""Django admin interface for the shopping cart models. """
-from ratelimitbackend import admin
+from django.contrib import admin
from shoppingcart.models import (
PaidCourseRegistrationAnnotation,
Coupon,
diff --git a/lms/djangoapps/verify_student/admin.py b/lms/djangoapps/verify_student/admin.py
index 6a7c69b9e2..cda4087799 100644
--- a/lms/djangoapps/verify_student/admin.py
+++ b/lms/djangoapps/verify_student/admin.py
@@ -1,4 +1,8 @@
-from ratelimitbackend import admin
+"""
+django admin pages for verify_student models
+"""
+
+from django.contrib import admin
from config_models.admin import ConfigurationModelAdmin
from verify_student.models import (
SoftwareSecurePhotoVerification,
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 833c8c6d61..4b11d62e9a 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1176,6 +1176,10 @@ MIDDLEWARE_CLASSES = (
# catches any uncaught RateLimitExceptions and returns a 403 instead of a 500
'ratelimitbackend.middleware.RateLimitMiddleware',
+
+ # force re-authentication before activating administrative functions
+ 'sudo.middleware.SudoMiddleware',
+
# needs to run after locale middleware (or anything that modifies the request context)
'edxmako.middleware.MakoMiddleware',
@@ -1897,6 +1901,9 @@ INSTALLED_APPS = (
# Surveys
'survey',
+ # Allows sudo-mode
+ 'sudo',
+
'lms.djangoapps.lms_xblock',
'openedx.core.djangoapps.content.course_overviews',
diff --git a/lms/static/coffee/src/instructor_dashboard/data_download.coffee b/lms/static/coffee/src/instructor_dashboard/data_download.coffee
index 4fa8de081e..38f97c34c9 100644
--- a/lms/static/coffee/src/instructor_dashboard/data_download.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/data_download.coffee
@@ -27,13 +27,13 @@ class DataDownload
@$problem_grade_report_csv_btn = @$section.find("input[name='problem-grade-report']'")
# response areas
- @$download = @$section.find '.data-download-container'
- @$download_display_text = @$download.find '.data-display-text'
+ @$download = @$section.find '.data-download-container'
+ @$download_display_text = @$download.find '.data-display-text'
@$download_request_response_error = @$download.find '.request-response-error'
- @$reports = @$section.find '.reports-download-container'
- @$download_display_table = @$reports.find '.data-display-table'
- @$reports_request_response = @$reports.find '.request-response'
- @$reports_request_response_error = @$reports.find '.request-response-error'
+ @$reports = @$section.find '.reports-download-container'
+ @$download_display_table = @$reports.find '.data-display-table'
+ @$reports_request_response = @$reports.find '.request-response'
+ @$reports_request_response_error = @$reports.find '.request-response-error'
@report_downloads = new (ReportDownloads()) @$section
@instructor_tasks = new (PendingInstructorTasks()) @$section
@@ -58,12 +58,14 @@ class DataDownload
$.ajax
dataType: 'json'
url: url
- error: (std_ajax_err) =>
+ error: std_ajax_err((=>
@$reports_request_response_error.text gettext("Error generating student profile information. Please try again.")
- $(".msg-error").css({"display":"block"})
+ $(".msg-error").css({"display": "block"})
+ ), true)
+
success: (data) =>
@$reports_request_response.text data['status']
- $(".msg-confirm").css({"display":"block"})
+ $(".msg-confirm").css({"display": "block"})
@$list_studs_btn.click (e) =>
url = @$list_studs_btn.data 'endpoint'
@@ -76,9 +78,11 @@ class DataDownload
$.ajax
dataType: 'json'
url: url
- error: (std_ajax_err) =>
+ error: std_ajax_err((=>
@clear_display()
@$download_request_response_error.text gettext("Error getting student list.")
+ ), true)
+
success: (data) =>
@clear_display()
@@ -95,7 +99,7 @@ class DataDownload
$table_placeholder = $ '', class: 'slickgrid'
@$download_display_table.append $table_placeholder
grid = new Slick.Grid($table_placeholder, grid_data, columns, options)
- # grid.autosizeColumns()
+ # grid.autosizeColumns()
@$list_may_enroll_csv_btn.click (e) =>
@clear_display()
@@ -104,12 +108,14 @@ class DataDownload
$.ajax
dataType: 'json'
url: url
- error: (std_ajax_err) =>
+ error: std_ajax_err((=>
@$reports_request_response_error.text gettext("Error generating list of students who may enroll. Please try again.")
- $(".msg-error").css({"display":"block"})
+ $(".msg-error").css({"display": "block"})
+ ), true)
+
success: (data) =>
@$reports_request_response.text data['status']
- $(".msg-confirm").css({"display":"block"})
+ $(".msg-confirm").css({"display": "block"})
@$grade_config_btn.click (e) =>
url = @$grade_config_btn.data 'endpoint'
@@ -117,9 +123,10 @@ class DataDownload
$.ajax
dataType: 'json'
url: url
- error: (std_ajax_err) =>
+ error: std_ajax_err((=>
@clear_display()
@$download_request_response_error.text gettext("Error retrieving grading configuration.")
+ ), true)
success: (data) =>
@clear_display()
@$download_display_text.html data['grading_config_summary']
@@ -131,20 +138,22 @@ class DataDownload
@onClickGradeDownload @$problem_grade_report_csv_btn, gettext("Error generating problem grade report. Please try again.")
onClickGradeDownload: (button, errorMessage) ->
- # Clear any CSS styling from the request-response areas
- #$(".msg-confirm").css({"display":"none"})
- #$(".msg-error").css({"display":"none"})
- @clear_display()
- url = button.data 'endpoint'
- $.ajax
- dataType: 'json'
- url: url
- error: (std_ajax_err) =>
- @$reports_request_response_error.text errorMessage
- $(".msg-error").css({"display":"block"})
- success: (data) =>
- @$reports_request_response.text data['status']
- $(".msg-confirm").css({"display":"block"})
+ # Clear any CSS styling from the request-response areas
+ #$(".msg-confirm").css({"display":"none"})
+ #$(".msg-error").css({"display":"none"})
+ @clear_display()
+ url = button.data 'endpoint'
+ $.ajax
+ dataType: 'json'
+ url: url
+ error: std_ajax_err((=>
+ @.$reports_request_response_error.text gettext('Error generating student profile information. Please try again.')
+ $('.msg-error').css 'display': 'block'
+ ), true
+ )
+ success: (data) =>
+ @$reports_request_response.text data['status']
+ $(".msg-confirm").css({"display": "block"})
# handler for when the section title is clicked.
onClickTitle: ->
@@ -166,8 +175,8 @@ class DataDownload
@$reports_request_response.empty()
@$reports_request_response_error.empty()
# Clear any CSS styling from the request-response areas
- $(".msg-confirm").css({"display":"none"})
- $(".msg-error").css({"display":"none"})
+ $(".msg-confirm").css({"display": "none"})
+ $(".msg-error").css({"display": "none"})
# export for use
# create parent namespaces if they do not already exist.
diff --git a/lms/static/coffee/src/instructor_dashboard/membership.coffee b/lms/static/coffee/src/instructor_dashboard/membership.coffee
index 4dc86bc849..057c89cec5 100644
--- a/lms/static/coffee/src/instructor_dashboard/membership.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/membership.coffee
@@ -14,7 +14,7 @@ emailStudents = false
class MemberListWidget
# create a MemberListWidget `$container` is a jquery object to embody.
# `params` holds template parameters. `params` should look like the defaults below.
- constructor: (@$container, params={}) ->
+ constructor: (@$container, params = {}) ->
params = _.defaults params,
title: "Member List"
info: """
@@ -117,14 +117,15 @@ class AuthListWidget extends MemberListWidget
# create revoke button and insert it into the row
label_trans = gettext("Revoke access")
- $revoke_btn = $ _.template(' <%= label %>
', {label: label_trans}),
+ $revoke_btn = $ _.template(' <%= label %>
',
+ {label: label_trans}),
class: 'revoke'
$revoke_btn.click =>
- @modify_member_access member.email, 'revoke', (error) =>
- # abort on error
- return @show_errors error unless error is null
- @clear_errors()
- @reload_list()
+ @modify_member_access member.email, 'revoke', (error) =>
+ # abort on error
+ return @show_errors error unless error is null
+ @clear_errors()
+ @reload_list()
@add_row [member.username, member.email, $revoke_btn]
# clear error display
@@ -139,11 +140,13 @@ class AuthListWidget extends MemberListWidget
$.ajax
dataType: 'json'
url: @list_endpoint
- data: rolename: @rolename
+ data:
+ rolename: @rolename
success: (data) => cb? null, data[@rolename]
- error: std_ajax_err =>
- `// Translators: A rolename appears this sentence. A rolename is something like "staff" or "beta tester".`
+ error: std_ajax_err((=>
+ # Translators: A rolename appears this sentence. A rolename is something like "staff" or "beta tester".
cb? gettext("Error fetching list for role") + " '#{@rolename}'"
+ ), true)
# send ajax request to modify access
# (add or remove them from the list)
@@ -158,7 +161,9 @@ class AuthListWidget extends MemberListWidget
rolename: @rolename
action: action
success: (data) => @member_response data
- error: std_ajax_err => cb? gettext "Error changing user's permissions."
+ error: std_ajax_err((=>
+ cb? gettext "Error changing user's permissions."
+ ), true)
member_response: (data) ->
@clear_errors()
@@ -204,15 +209,15 @@ class @AutoEnrollmentViaCsv
event.preventDefault()
data = new FormData(event.currentTarget)
$.ajax
- dataType: 'json'
- type: 'POST'
- url: event.currentTarget.action
- data: data
- processData: false
- contentType: false
- success: (data) =>
- @processing = false
- @display_response data
+ dataType: 'json'
+ type: 'POST'
+ url: event.currentTarget.action
+ data: data
+ processData: false
+ contentType: false
+ success: (data) =>
+ @processing = false
+ @display_response data
return false
@@ -246,7 +251,7 @@ class @AutoEnrollmentViaCsv
if student_result.is_general_error
details.push student_result.response
else
- response_message = student_result.username + ' ('+ student_result.email + '): ' + ' (' + student_result.response + ')'
+ response_message = student_result.username + ' (' + student_result.email + '): ' + ' (' + student_result.response + ')'
details.push response_message
@$results.append @render_notification_view type, title, message, details
@@ -261,23 +266,23 @@ class @AutoEnrollmentViaCsv
render_notification_view: (type, title, message, details) ->
notification_model = new NotificationModel()
notification_model.set({
- 'type': type,
- 'title': title,
- 'message': message,
- 'details': details,
+ 'type': type,
+ 'title': title,
+ 'message': message,
+ 'details': details,
});
- view = new NotificationView(model:notification_model);
+ view = new NotificationView(model: notification_model);
view.render()
return view.$el.html()
class BetaTesterBulkAddition
constructor: (@$container) ->
# gather elements
- @$identifier_input = @$container.find("textarea[name='student-ids-for-beta']")
- @$btn_beta_testers = @$container.find("input[name='beta-testers']")
- @$checkbox_autoenroll = @$container.find("input[name='auto-enroll']")
+ @$identifier_input = @$container.find("textarea[name='student-ids-for-beta']")
+ @$btn_beta_testers = @$container.find("input[name='beta-testers']")
+ @$checkbox_autoenroll = @$container.find("input[name='auto-enroll']")
@$checkbox_emailstudents = @$container.find("input[name='email-students-beta']")
- @$task_response = @$container.find(".request-response")
+ @$task_response = @$container.find(".request-response")
@$request_response_error = @$container.find(".request-response-error")
# click handlers
@@ -296,7 +301,10 @@ class BetaTesterBulkAddition
url: @$btn_beta_testers.data 'endpoint'
data: send_data
success: (data) => @display_response data
- error: std_ajax_err => @fail_with_error gettext "Error adding/removing users as beta testers."
+ error: std_ajax_err((=>
+ @fail_with_error gettext "Error adding/removing users as beta testers."
+ ), true)
+
# clear the input text field
clear_input: ->
@@ -365,13 +373,13 @@ class BetaTesterBulkAddition
class BatchEnrollment
constructor: (@$container) ->
# gather elements
- @$identifier_input = @$container.find("textarea[name='student-ids']")
- @$enrollment_button = @$container.find(".enrollment-button")
- @$is_course_white_label = @$container.find("#is_course_white_label").val()
- @$reason_field = @$container.find("textarea[name='reason-field']")
- @$checkbox_autoenroll = @$container.find("input[name='auto-enroll']")
+ @$identifier_input = @$container.find("textarea[name='student-ids']")
+ @$enrollment_button = @$container.find(".enrollment-button")
+ @$is_course_white_label = @$container.find("#is_course_white_label").val()
+ @$reason_field = @$container.find("textarea[name='reason-field']")
+ @$checkbox_autoenroll = @$container.find("input[name='auto-enroll']")
@$checkbox_emailstudents = @$container.find("input[name='email-students']")
- @$task_response = @$container.find(".request-response")
+ @$task_response = @$container.find(".request-response")
@$request_response_error = @$container.find(".request-response-error")
# attach click handler for enrollment buttons
@@ -395,8 +403,9 @@ class BatchEnrollment
url: $(event.target).data 'endpoint'
data: send_data
success: (data) => @display_response data
- error: std_ajax_err => @fail_with_error gettext "Error enrolling/unenrolling users."
-
+ error: std_ajax_err((=>
+ @fail_with_error gettext "Error enrolling/unenrolling users."
+ ), true)
# clear the input text field
clear_input: ->
@@ -478,7 +487,7 @@ class BatchEnrollment
else
allowed.push student_results
- # The instructor is trying to unenroll someone who is not enrolled or allowed to enroll; non-sensical action.
+ # The instructor is trying to unenroll someone who is not enrolled or allowed to enroll; non-sensical action.
else if data_from_server.action is 'unenroll' and not (student_results.before.enrollment) and not (student_results.before.allowed)
notunenrolled.push student_results
@@ -572,11 +581,11 @@ class AuthList
# rolename is the name of Role for forums for the forum endpoints
constructor: (@$container, @rolename) ->
# gather elements
- @$display_table = @$container.find('.auth-list-table')
+ @$display_table = @$container.find('.auth-list-table')
@$request_response_error = @$container.find('.request-response-error')
- @$add_section = @$container.find('.auth-list-add')
- @$allow_field = @$add_section.find("input[name='email']")
- @$allow_button = @$add_section.find("input[name='allow']")
+ @$add_section = @$container.find('.auth-list-add')
+ @$allow_field = @$add_section.find("input[name='email']")
+ @$allow_button = @$add_section.find("input[name='allow']")
# attach click handler
@$allow_button.click =>
@@ -597,7 +606,7 @@ class AuthList
options =
enableCellNavigation: true
enableColumnReorder: false
- # autoHeight: true
+ # autoHeight: true
forceFitColumns: true
# this is a hack to put a button/link in a slick grid cell
@@ -618,10 +627,10 @@ class AuthList
field: 'first_name'
name: 'First Name'
,
- # id: 'last_name'
- # field: 'last_name'
- # name: 'Last Name'
- # ,
+ # id: 'last_name'
+ # field: 'last_name'
+ # name: 'Last Name'
+ # ,
id: 'revoke'
field: 'revoke'
name: 'Revoke'
@@ -646,9 +655,13 @@ class AuthList
$.ajax
dataType: 'json'
url: @$display_table.data 'endpoint'
- data: rolename: @rolename
+ data:
+ rolename: @rolename
success: load_auth_list
- error: std_ajax_err => @$request_response_error.text "Error fetching list for '#{@rolename}'"
+ error: std_ajax_err((=>
+ @$request_response_error.text "Error fetching list for '#{@rolename}'"
+ ), true)
+
# slickgrid's layout collapses when rendered
@@ -670,8 +683,9 @@ class AuthList
rolename: @rolename
action: action
success: (data) -> cb?(data)
- error: std_ajax_err => @$request_response_error.text gettext "Error changing user's permissions."
-
+ error: std_ajax_err((=>
+ @$request_response_error.text gettext "Error changing user's permissions."
+ ), true)
# Membership Section
class Membership
diff --git a/lms/static/coffee/src/instructor_dashboard/send_email.coffee b/lms/static/coffee/src/instructor_dashboard/send_email.coffee
index 9851658b5a..6a950bfdc6 100644
--- a/lms/static/coffee/src/instructor_dashboard/send_email.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/send_email.coffee
@@ -79,9 +79,9 @@ class SendEmail
data: send_data
success: (data) =>
@display_response success_message
-
- error: std_ajax_err =>
+ error: std_ajax_err((=>
@fail_with_error gettext('Error sending email.')
+ ), true)
else
@$task_response.empty()
@@ -99,38 +99,41 @@ class SendEmail
else
@$history_request_response_error.text gettext("There is no email history for this course.")
# Enable the msg-warning css display
- @$history_request_response_error.css({"display":"block"})
- error: std_ajax_err =>
+ @$history_request_response_error.css({"display": "block"})
+ error: std_ajax_err((=>
@$history_request_response_error.text gettext("There was an error obtaining email task history for this course.")
+ ), true)
# List content history for emails sent
@$btn_task_history_email_content.click =>
url = @$btn_task_history_email_content.data 'endpoint'
$.ajax
dataType: 'json'
- url : url
+ url: url
success: (data) =>
if data.emails.length
create_email_content_table @$table_email_content_history, @$email_content_table_inner, data.emails
create_email_message_views @$email_messages_wrapper, data.emails
else
@$content_request_response_error.text gettext("There is no email history for this course.")
- @$content_request_response_error.css({"display":"block"})
- error: std_ajax_err =>
+ @$content_request_response_error.css({"display": "block"})
+ error: std_ajax_err((=>
@$content_request_response_error.text gettext("There was an error obtaining email content history for this course.")
+ ), true)
+
fail_with_error: (msg) ->
console.warn msg
@$task_response.empty()
@$request_response_error.empty()
@$request_response_error.text msg
- $(".msg-confirm").css({"display":"none"})
+ $(".msg-confirm").css({"display": "none"})
display_response: (data_from_server) ->
@$task_response.empty()
@$request_response_error.empty()
@$task_response.text(data_from_server)
- $(".msg-confirm").css({"display":"block"})
+ $(".msg-confirm").css({"display": "block"})
# Email Section
diff --git a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
index cabef93b0c..4114e19821 100644
--- a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
@@ -32,37 +32,42 @@ class @StudentAdmin
# some buttons are optional because they can be flipped by the instructor task feature switch
# student-specific
@$field_student_select_progress = find_and_assert @$section, "input[name='student-select-progress']"
- @$field_student_select_grade = find_and_assert @$section, "input[name='student-select-grade']"
- @$progress_link = find_and_assert @$section, "a.progress-link"
+ @$field_student_select_grade = find_and_assert @$section, "input[name='student-select-grade']"
+ @$progress_link = find_and_assert @$section, "a.progress-link"
@$field_problem_select_single = find_and_assert @$section, "input[name='problem-select-single']"
- @$btn_reset_attempts_single = find_and_assert @$section, "input[name='reset-attempts-single']"
- @$btn_delete_state_single = @$section.find "input[name='delete-state-single']"
- @$btn_rescore_problem_single = @$section.find "input[name='rescore-problem-single']"
- @$btn_task_history_single = @$section.find "input[name='task-history-single']"
- @$table_task_history_single = @$section.find ".task-history-single-table"
+ @$btn_reset_attempts_single = find_and_assert @$section, "input[name='reset-attempts-single']"
+ @$btn_delete_state_single = @$section.find "input[name='delete-state-single']"
+ @$btn_rescore_problem_single = @$section.find "input[name='rescore-problem-single']"
+ @$btn_task_history_single = @$section.find "input[name='task-history-single']"
+ @$table_task_history_single = @$section.find ".task-history-single-table"
# entrance-exam-specific
- @$field_entrance_exam_student_select_grade = @$section.find "input[name='entrance-exam-student-select-grade']"
- @$btn_reset_entrance_exam_attempts = @$section.find "input[name='reset-entrance-exam-attempts']"
- @$btn_delete_entrance_exam_state = @$section.find "input[name='delete-entrance-exam-state']"
- @$btn_rescore_entrance_exam = @$section.find "input[name='rescore-entrance-exam']"
- @$btn_skip_entrance_exam = @$section.find "input[name='skip-entrance-exam']"
- @$btn_entrance_exam_task_history = @$section.find "input[name='entrance-exam-task-history']"
- @$table_entrance_exam_task_history = @$section.find ".entrance-exam-task-history-table"
+ @$field_entrance_exam_student_select_grade = @$section.find "input[name='entrance-exam-student-select-grade']"
+ @$btn_reset_entrance_exam_attempts = @$section.find "input[name='reset-entrance-exam-attempts']"
+ @$btn_delete_entrance_exam_state = @$section.find "input[name='delete-entrance-exam-state']"
+ @$btn_rescore_entrance_exam = @$section.find "input[name='rescore-entrance-exam']"
+ @$btn_skip_entrance_exam = @$section.find "input[name='skip-entrance-exam']"
+ @$btn_entrance_exam_task_history = @$section.find "input[name='entrance-exam-task-history']"
+ @$table_entrance_exam_task_history = @$section.find ".entrance-exam-task-history-table"
# course-specific
- @$field_problem_select_all = @$section.find "input[name='problem-select-all']"
- @$btn_reset_attempts_all = @$section.find "input[name='reset-attempts-all']"
- @$btn_rescore_problem_all = @$section.find "input[name='rescore-problem-all']"
- @$btn_task_history_all = @$section.find "input[name='task-history-all']"
- @$table_task_history_all = @$section.find ".task-history-all-table"
- @instructor_tasks = new (PendingInstructorTasks()) @$section
+ @$field_problem_select_all = @$section.find "input[name='problem-select-all']"
+ @$btn_reset_attempts_all = @$section.find "input[name='reset-attempts-all']"
+ @$btn_rescore_problem_all = @$section.find "input[name='rescore-problem-all']"
+ @$btn_task_history_all = @$section.find "input[name='task-history-all']"
+ @$table_task_history_all = @$section.find ".task-history-all-table"
+ @instructor_tasks = new (PendingInstructorTasks()) @$section
# response areas
@$request_response_error_progress = find_and_assert @$section, ".student-specific-container .request-response-error"
@$request_response_error_grade = find_and_assert @$section, ".student-grade-container .request-response-error"
- @$request_response_error_ee = @$section.find ".entrance-exam-grade-container .request-response-error"
- @$request_response_error_all = @$section.find ".course-specific-container .request-response-error"
+ @$request_response_error_ee = @$section.find ".entrance-exam-grade-container .request-response-error"
+ @$request_response_error_all = @$section.find ".course-specific-container .request-response-error"
+
+ $student_grade_container = find_and_assert @$section, ".student-grade-container"
+ unique_student_identifier = @$field_student_select_grade.val()
+ if unique_student_identifier
+ @scroll_to_section($student_grade_container)
# attach click handlers
@@ -78,10 +83,13 @@ class @StudentAdmin
$.ajax
dataType: 'json'
url: @$progress_link.data 'endpoint'
- data: unique_student_identifier: unique_student_identifier
+ data:
+ unique_student_identifier: unique_student_identifier
success: @clear_errors_then (data) ->
window.location = data.progress_url
- error: std_ajax_err => @$request_response_error_progress.text full_error_message
+ error: std_ajax_err((=>
+ @$request_response_error_progress.text full_error_message
+ ), true)
# reset attempts for student on problem
@$btn_reset_attempts_single.click =>
@@ -97,15 +105,19 @@ class @StudentAdmin
delete_module: false
success_message = gettext("Success! Problem attempts reset for problem '<%= problem_id %>' and student '<%= student_id %>'.")
error_message = gettext("Error resetting problem attempts for problem '<%= problem_id %>' and student '<%= student_id %>'. Make sure that the problem and student identifiers are complete and correct.")
- full_success_message = _.template(success_message, {problem_id: problem_to_reset, student_id: unique_student_identifier})
- full_error_message = _.template(error_message, {problem_id: problem_to_reset, student_id: unique_student_identifier})
+ full_success_message = _.template(success_message,
+ {problem_id: problem_to_reset, student_id: unique_student_identifier})
+ full_error_message = _.template(error_message,
+ {problem_id: problem_to_reset, student_id: unique_student_identifier})
$.ajax
dataType: 'json'
url: @$btn_reset_attempts_single.data 'endpoint'
data: send_data
success: @clear_errors_then -> alert full_success_message
- error: std_ajax_err => @$request_response_error_grade.text full_error_message
+ error: std_ajax_err((=>
+ @$request_response_error_grade.text full_error_message
+ ), true)
# delete state for student on problem
@$btn_delete_state_single.click =>
@@ -116,7 +128,8 @@ class @StudentAdmin
if not problem_to_reset
return @$request_response_error_grade.text gettext("Please enter a problem location.")
confirm_message = gettext("Delete student '<%= student_id %>'s state on problem '<%= problem_id %>'?")
- full_confirm_message = _.template(confirm_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+ full_confirm_message = _.template(confirm_message,
+ {student_id: unique_student_identifier, problem_id: problem_to_reset})
if window.confirm full_confirm_message
send_data =
@@ -124,14 +137,17 @@ class @StudentAdmin
problem_to_reset: problem_to_reset
delete_module: true
error_message = gettext("Error deleting student '<%= student_id %>'s state on problem '<%= problem_id %>'. Make sure that the problem and student identifiers are complete and correct.")
- full_error_message = _.template(error_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+ full_error_message = _.template(error_message,
+ {student_id: unique_student_identifier, problem_id: problem_to_reset})
$.ajax
dataType: 'json'
url: @$btn_delete_state_single.data 'endpoint'
data: send_data
success: @clear_errors_then -> alert gettext('Module state successfully deleted.')
- error: std_ajax_err => @$request_response_error_grade.text full_error_message
+ error: std_ajax_err((=>
+ @$request_response_error_grade.text full_error_message
+ ), true)
else
# Clear error messages if "Cancel" was chosen on confirmation alert
@clear_errors()
@@ -148,16 +164,20 @@ class @StudentAdmin
unique_student_identifier: unique_student_identifier
problem_to_reset: problem_to_reset
success_message = gettext("Started rescore problem task for problem '<%= problem_id %>' and student '<%= student_id %>'. Click the 'Show Background Task History for Student' button to see the status of the task.")
- full_success_message = _.template(success_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+ full_success_message = _.template(success_message,
+ {student_id: unique_student_identifier, problem_id: problem_to_reset})
error_message = gettext("Error starting a task to rescore problem '<%= problem_id %>' for student '<%= student_id %>'. Make sure that the the problem and student identifiers are complete and correct.")
- full_error_message = _.template(error_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+ full_error_message = _.template(error_message,
+ {student_id: unique_student_identifier, problem_id: problem_to_reset})
$.ajax
dataType: 'json'
url: @$btn_rescore_problem_single.data 'endpoint'
data: send_data
success: @clear_errors_then -> alert full_success_message
- error: std_ajax_err => @$request_response_error_grade.text full_error_message
+ error: std_ajax_err((=>
+ @$request_response_error_grade.text full_error_message
+ ), true)
# list task history for student+problem
@$btn_task_history_single.click =>
@@ -171,7 +191,8 @@ class @StudentAdmin
unique_student_identifier: unique_student_identifier
problem_location_str: problem_to_reset
error_message = gettext("Error getting task history for problem '<%= problem_id %>' and student '<%= student_id %>'. Make sure that the problem and student identifiers are complete and correct.")
- full_error_message = _.template(error_message, {student_id: unique_student_identifier, problem_id: problem_to_reset})
+ full_error_message = _.template(error_message,
+ {student_id: unique_student_identifier, problem_id: problem_to_reset})
$.ajax
dataType: 'json'
@@ -179,9 +200,11 @@ class @StudentAdmin
data: send_data
success: @clear_errors_then (data) =>
create_task_list_table @$table_task_history_single, data.tasks
- error: std_ajax_err => @$request_response_error_grade.text full_error_message
+ error: std_ajax_err((=>
+ @$request_response_error_grade.text full_error_message
+ ), true)
- # reset entrance exam attempts for student
+ # reset entrance exam attempts for student
@$btn_reset_entrance_exam_attempts.click =>
unique_student_identifier = @$field_entrance_exam_student_select_grade.val()
if not unique_student_identifier
@@ -198,12 +221,13 @@ class @StudentAdmin
success_message = gettext("Entrance exam attempts is being reset for student '{student_id}'.")
full_success_message = interpolate_text(success_message, {student_id: unique_student_identifier})
alert full_success_message
- error: std_ajax_err =>
+ error: std_ajax_err((=>
error_message = gettext("Error resetting entrance exam attempts for student '{student_id}'. Make sure student identifier is correct.")
full_error_message = interpolate_text(error_message, {student_id: unique_student_identifier})
@$request_response_error_ee.text full_error_message
+ ), true)
- # start task to rescore entrance exam for student
+ # start task to rescore entrance exam for student
@$btn_rescore_entrance_exam.click =>
unique_student_identifier = @$field_entrance_exam_student_select_grade.val()
if not unique_student_identifier
@@ -224,7 +248,7 @@ class @StudentAdmin
full_error_message = interpolate_text(error_message, {student_id: unique_student_identifier})
@$request_response_error_ee.text full_error_message
- # Mark a student to skip entrance exam
+ # Mark a student to skip entrance exam
@$btn_skip_entrance_exam.click =>
unique_student_identifier = @$field_entrance_exam_student_select_grade.val()
if not unique_student_identifier
@@ -246,7 +270,7 @@ class @StudentAdmin
error_message = gettext("An error occurred. Make sure that the student's username or email address is correct and try again.")
@$request_response_error_ee.text error_message
- # delete student state for entrance exam
+ # delete student state for entrance exam
@$btn_delete_entrance_exam_state.click =>
unique_student_identifier = @$field_entrance_exam_student_select_grade.val()
if not unique_student_identifier
@@ -308,7 +332,9 @@ class @StudentAdmin
url: @$btn_reset_attempts_all.data 'endpoint'
data: send_data
success: @clear_errors_then -> alert full_success_message
- error: std_ajax_err => @$request_response_error_all.text full_error_message
+ error: std_ajax_err((=>
+ @$request_response_error_all.text full_error_message
+ ), true)
else
# Clear error messages if "Cancel" was chosen on confirmation alert
@clear_errors()
@@ -334,7 +360,9 @@ class @StudentAdmin
url: @$btn_rescore_problem_all.data 'endpoint'
data: send_data
success: @clear_errors_then -> alert full_success_message
- error: std_ajax_err => @$request_response_error_all.text full_error_message
+ error: std_ajax_err((=>
+ @$request_response_error_all.text full_error_message
+ ), true)
else
# Clear error messages if "Cancel" was chosen on confirmation alert
@clear_errors()
@@ -353,7 +381,9 @@ class @StudentAdmin
data: send_data
success: @clear_errors_then (data) =>
create_task_list_table @$table_task_history_all, data.tasks
- error: std_ajax_err => @$request_response_error_all.text gettext("Error listing task history for this student and problem.")
+ error: std_ajax_err((=>
+ @$request_response_error_all.text gettext("Error listing task history for this student and problem.")
+ ), true)
# wraps a function, but first clear the error displays
clear_errors_then: (cb) ->
@@ -371,6 +401,10 @@ class @StudentAdmin
@$request_response_error_ee.empty()
@$request_response_error_all.empty()
+
+ scroll_to_section: (element) ->
+ $(window).scrollTop(element.offset().top).scrollLeft(element.offset().left)
+
# handler for when the section title is clicked.
onClickTitle: -> @instructor_tasks.task_poller.start()
diff --git a/lms/static/coffee/src/instructor_dashboard/util.coffee b/lms/static/coffee/src/instructor_dashboard/util.coffee
index 7a9f80b167..b1c89f760f 100644
--- a/lms/static/coffee/src/instructor_dashboard/util.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/util.coffee
@@ -19,10 +19,12 @@ find_and_assert = ($root, selector) ->
#
# wraps a `handler` function so that first
# it prints basic error information to the console.
-@std_ajax_err = (handler) -> (jqXHR, textStatus, errorThrown) ->
+@std_ajax_err = (handler, sudo_reload=false) -> (jqXHR, textStatus, errorThrown) ->
console.warn """ajax error
textStatus: #{textStatus}
errorThrown: #{errorThrown}"""
+ if sudo_reload == true and jqXHR.status == 401
+ window.location.reload()
handler.apply this, arguments
@@ -297,7 +299,10 @@ class @PendingInstructorTasks
@$no_tasks_message.empty()
@$no_tasks_message.append $('').text gettext("No tasks currently running.")
@$no_tasks_message.show()
- error: std_ajax_err => console.error "Error finding pending tasks to display"
+ error: std_ajax_err((=>
+ console.error "Error finding pending tasks to display"
+ ), true)
+
### /Pending Instructor Tasks Section ####
class KeywordValidator
diff --git a/lms/static/js/spec/staff_debug_actions_spec.js b/lms/static/js/spec/staff_debug_actions_spec.js
index 19cfa749e6..e9f75c2a82 100644
--- a/lms/static/js/spec/staff_debug_actions_spec.js
+++ b/lms/static/js/spec/staff_debug_actions_spec.js
@@ -4,13 +4,18 @@ define(['backbone', 'jquery', 'js/staff_debug_actions'],
describe('StaffDebugActions', function () {
var location = 'i4x://edX/Open_DemoX/edx_demo_course/problem/test_loc';
var locationName = 'test_loc';
+ var action = {location: location, locationName: locationName};
var fixture_id = 'sd_fu_' + locationName;
var fixture = $('', { id: fixture_id, placeholder: "userman" });
describe('get_url ', function () {
it('defines url to courseware ajax entry point', function () {
spyOn(StaffDebug, "get_current_url").andReturn("/courses/edX/Open_DemoX/edx_demo_course/courseware/stuff");
- expect(StaffDebug.get_url('rescore_problem')).toBe('/courses/edX/Open_DemoX/edx_demo_course/instructor/api/rescore_problem');
+ $('body').append(fixture);
+ var expected_url = '/courses/edX/Open_DemoX/edx_demo_course/instructor?unique_student_identifier=userman&problem_to_reset=' + encodeURIComponent(action.location);
+ expect(StaffDebug.get_url(action)).toBe(expected_url);
+
+ $('#' + fixture_id).remove();
});
});
@@ -36,63 +41,20 @@ define(['backbone', 'jquery', 'js/staff_debug_actions'],
$('#' + fixture_id).remove();
});
});
- describe('reset', function () {
+ describe('student_grade_adjustemnts', function () {
it('makes an ajax call with the expected parameters', function () {
$('body').append(fixture);
- spyOn($, 'ajax');
- StaffDebug.reset(locationName, location);
+ spyOn(StaffDebug, 'goto_student_admin');
- expect($.ajax.mostRecentCall.args[0]['type']).toEqual('GET');
- expect($.ajax.mostRecentCall.args[0]['data']).toEqual({
- 'problem_to_reset': location,
- 'unique_student_identifier': 'userman',
- 'delete_module': false
- });
- expect($.ajax.mostRecentCall.args[0]['url']).toEqual(
- '/instructor/api/reset_student_attempts'
- );
- $('#' + fixture_id).remove();
- });
- });
- describe('sdelete', function () {
- it('makes an ajax call with the expected parameters', function () {
- $('body').append(fixture);
+ StaffDebug.student_grade_adjustemnts(locationName, location);
- spyOn($, 'ajax');
- StaffDebug.sdelete(locationName, location);
+ var expected_url = get_url(action) + '#view-student_admin';
- expect($.ajax.mostRecentCall.args[0]['type']).toEqual('GET');
- expect($.ajax.mostRecentCall.args[0]['data']).toEqual({
- 'problem_to_reset': location,
- 'unique_student_identifier': 'userman',
- 'delete_module': true
- });
- expect($.ajax.mostRecentCall.args[0]['url']).toEqual(
- '/instructor/api/reset_student_attempts'
- );
+ expect(StaffDebug.goto_student_admin).toHaveBeenCalledWith(expected_url);
$('#' + fixture_id).remove();
});
});
- describe('rescore', function () {
- it('makes an ajax call with the expected parameters', function () {
- $('body').append(fixture);
-
- spyOn($, 'ajax');
- StaffDebug.rescore(locationName, location);
-
- expect($.ajax.mostRecentCall.args[0]['type']).toEqual('GET');
- expect($.ajax.mostRecentCall.args[0]['data']).toEqual({
- 'problem_to_reset': location,
- 'unique_student_identifier': 'userman',
- 'delete_module': false
- });
- expect($.ajax.mostRecentCall.args[0]['url']).toEqual(
- '/instructor/api/rescore_problem'
- );
- $('#' + fixture_id).remove();
- });
- });
});
});
\ No newline at end of file
diff --git a/lms/static/js/staff_debug_actions.js b/lms/static/js/staff_debug_actions.js
index 35ce0a4048..0dab8cacec 100644
--- a/lms/static/js/staff_debug_actions.js
+++ b/lms/static/js/staff_debug_actions.js
@@ -3,13 +3,15 @@ var StaffDebug = (function(){
get_current_url = function() {
return window.location.pathname;
- }
+ };
get_url = function(action){
+ var problem_to_reset = encodeURIComponent(action.location);
+ var unique_student_identifier = get_user(action.locationName);
var pathname = this.get_current_url();
- var url = pathname.substr(0,pathname.indexOf('/courseware')) + '/instructor/api/' + action;
+ var url = pathname.substr(0,pathname.indexOf('/courseware')) + '/instructor'+ '?unique_student_identifier=' + unique_student_identifier + '&problem_to_reset=' + problem_to_reset;
return url;
- }
+ };
sanitized_string = function(string) {
return string.replace(/[.*+?^:${}()|[\]\\]/g, "\\$&");
@@ -22,95 +24,21 @@ var StaffDebug = (function(){
uname = $('#sd_fu_' + locname).attr('placeholder');
}
return uname;
- }
+ };
- do_idash_action = function(action){
- var pdata = {
- 'problem_to_reset': action.location,
- 'unique_student_identifier': get_user(action.locationName),
- 'delete_module': action.delete_module
- }
- $.ajax({
- type: "GET",
- url: get_url(action.method),
- data: pdata,
- success: function(data){
- var text = _.template(
- action.success_msg,
- {user: data.student},
- {interpolate: /\{(.+?)\}/g}
- )
- var html = _.template(
- '
{text}
',
- {text: text},
- {interpolate: /\{(.+?)\}/g}
- )
- $("#result_"+action.locationName).html(html);
- },
- error: function(request, status, error) {
- var response_json;
- try {
- response_json = $.parseJSON(request.responseText);
- } catch(e) {
- response_json = { error: gettext('Unknown Error Occurred.') };
- }
- var text = _.template(
- '{error_msg} {error}',
- {
- error_msg: action.error_msg,
- error: response_json.error
- },
- {interpolate: /\{(.+?)\}/g}
- )
- var html = _.template(
- '{text}
',
- {text: text},
- {interpolate: /\{(.+?)\}/g}
- )
- $("#result_"+action.locationName).html(html);
- },
- dataType: 'json'
- });
- }
+ goto_student_admin = function(location) {
+ window.location = location;
+ };
- reset = function(locname, location){
- this.do_idash_action({
- locationName: locname,
- location: location,
- method: 'reset_student_attempts',
- success_msg: gettext('Successfully reset the attempts for user {user}'),
- error_msg: gettext('Failed to reset attempts.'),
- delete_module: false
- });
- }
-
- sdelete = function(locname, location){
- this.do_idash_action({
- locationName: locname,
- location: location,
- method: 'reset_student_attempts',
- success_msg: gettext('Successfully deleted student state for user {user}'),
- error_msg: gettext('Failed to delete student state.'),
- delete_module: true
- });
- }
-
- rescore = function(locname, location){
- this.do_idash_action({
- locationName: locname,
- location: location,
- method: 'rescore_problem',
- success_msg: gettext('Successfully rescored problem for user {user}'),
- error_msg: gettext('Failed to rescore problem.'),
- delete_module: false
- });
- }
+ student_grade_adjustemnts = function(locname, location){
+ var action = {locationName: locname, location: location};
+ var instructor_tab_url = get_url(action);
+ this.goto_student_admin(instructor_tab_url + '#view-student_admin');
+ };
return {
- reset: reset,
- sdelete: sdelete,
- rescore: rescore,
- do_idash_action: do_idash_action,
+ student_grade_adjustemnts: student_grade_adjustemnts,
+ goto_student_admin: goto_student_admin,
get_current_url: get_current_url,
get_url: get_url,
get_user: get_user,
@@ -121,16 +49,8 @@ var StaffDebug = (function(){
// Register click handlers
$(document).ready(function() {
var $courseContent = $('.course-content');
- $courseContent.on("click", '.staff-debug-reset', function() {
- StaffDebug.reset($(this).parent().data('location-name'), $(this).parent().data('location'));
- return false;
- });
- $courseContent.on("click", '.staff-debug-sdelete', function() {
- StaffDebug.sdelete($(this).parent().data('location-name'), $(this).parent().data('location'));
- return false;
- });
- $courseContent.on("click", '.staff-debug-rescore', function() {
- StaffDebug.rescore($(this).parent().data('location-name'), $(this).parent().data('location'));
+ $courseContent.on("click", '.staff-debug-grade-adjustments', function() {
+ StaffDebug.student_grade_adjustemnts($(this).parent().data('location-name'), $(this).parent().data('location'));
return false;
});
});
diff --git a/lms/templates/instructor/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
index a7d3b92279..afd0037792 100644
--- a/lms/templates/instructor/instructor_dashboard_2/student_admin.html
+++ b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -39,17 +39,22 @@
diff --git a/lms/templates/sudo/sudo.html b/lms/templates/sudo/sudo.html
new file mode 100644
index 0000000000..3dcfe1f0bf
--- /dev/null
+++ b/lms/templates/sudo/sudo.html
@@ -0,0 +1,21 @@
+{% extends "main_django.html" %}
+{% load i18n %}
+
+{% block body %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/lms/urls.py b/lms/urls.py
index adc0a090c6..575389fe4a 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -1,11 +1,11 @@
from django.conf import settings
from django.conf.urls import patterns, include, url
-from ratelimitbackend import admin
from django.conf.urls.static import static
import django.contrib.auth.views
from microsite_configuration import microsite
import auth_exchange.views
+from edx_admin import admin
# Uncomment the next two lines to enable the admin:
if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
@@ -80,6 +80,8 @@ urlpatterns = (
# Course content API
url(r'^api/course_structure/', include('course_structure_api.urls', namespace='course_structure_api')),
+ url(r'^sudo/$', 'sudo.views.sudo'),
+
# User API endpoints
url(r'^api/user/', include('openedx.core.djangoapps.user_api.urls')),
diff --git a/openedx/core/djangoapps/content/course_structures/admin.py b/openedx/core/djangoapps/content/course_structures/admin.py
index 64bbdad86c..759863c390 100644
--- a/openedx/core/djangoapps/content/course_structures/admin.py
+++ b/openedx/core/djangoapps/content/course_structures/admin.py
@@ -1,4 +1,8 @@
-from ratelimitbackend import admin
+"""
+django admin pages for course_structures model
+"""
+
+from django.contrib import admin
from .models import CourseStructure
diff --git a/openedx/core/djangoapps/credit/admin.py b/openedx/core/djangoapps/credit/admin.py
index 5700f0ef73..b3c14f556b 100644
--- a/openedx/core/djangoapps/credit/admin.py
+++ b/openedx/core/djangoapps/credit/admin.py
@@ -1,10 +1,12 @@
"""
Django admin page for credit eligibility
"""
+
from ratelimitbackend import admin
from openedx.core.djangoapps.credit.models import (
CreditCourse, CreditProvider, CreditEligibility, CreditRequest
)
+from django.contrib import admin
class CreditCourseAdmin(admin.ModelAdmin):
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index b84022cd4f..760f5ae3b5 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -12,6 +12,7 @@
-e git+https://github.com/edx/django-pipeline.git@88ec8a011e481918fdc9d2682d4017c835acd8be#egg=django-pipeline
-e git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki
-e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-5#egg=django-oauth2-provider
+-e git+https://github.com/edx/django-sudo.git@5ceb91236b477ce2726c538a2d8631884bda2684#egg=django-sudo
-e git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=mongodb_proxy
git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev