Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Calen Pennington
2014-05-13 15:31:40 -04:00
parent 240d91daeb
commit 6c546fbf1f
22 changed files with 56 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/djangoapps/instructor/tests/test_email.py
View File

@@ -35,11 +35,7 @@ class TestNewInstructorDashboardEmailViewMongoBacked(ModuleStoreTestCase):
self.client.login(username=instructor.username, password="test")
# URL for instructor dash
<<<<<<< HEAD
self.url = reverse('instructor_dashboard_2', kwargs={'course_id': self.course.id.to_deprecated_string()})
=======
self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id})
>>>>>>> edx/master
self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
# URL for email view
self.email_link = '<a href="" data-section="send_email">Email</a>'
@@ -127,11 +123,7 @@ class TestNewInstructorDashboardEmailViewXMLBacked(ModuleStoreTestCase):
self.client.login(username=instructor.username, password="test")
# URL for instructor dash
<<<<<<< HEAD
self.url = reverse('instructor_dashboard_2', kwargs={'course_id': self.course_key.to_deprecated_string()})
=======
self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course_name})
>>>>>>> edx/master
self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course_key.to_deprecated_string()})
# URL for email view
self.email_link = '<a href="" data-section="send_email">Email</a>'

6
lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
View File

@@ -53,11 +53,7 @@ class TestInstructorDashboardAnonCSV(ModuleStoreTestCase, LoginEnrollmentTestCas
def test_download_anon_csv(self):
course = self.toy
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
with patch('instructor.views.legacy.unique_id_for_user') as mock_unique:
mock_unique.return_value = 42

6
lms/djangoapps/instructor/tests/test_legacy_download_csv.py
View File

@@ -50,11 +50,7 @@ class TestInstructorDashboardGradeDownloadCSV(ModuleStoreTestCase, LoginEnrollme
def test_download_grades_csv(self):
course = self.toy
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
msg = "url = {0}\n".format(url)
response = self.client.post(url, {'action': 'Download CSV of all student grades for this course'})
msg += "instructor dashboard download csv grades: response = '{0}'\n".format(response)

6
lms/djangoapps/instructor/tests/test_legacy_email.py
View File

@@ -32,11 +32,7 @@ class TestInstructorDashboardEmailView(ModuleStoreTestCase):
self.client.login(username=instructor.username, password="test")
# URL for instructor dash
<<<<<<< HEAD
self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
=======
self.url = reverse('instructor_dashboard_legacy', kwargs={'course_id': self.course.id})
>>>>>>> edx/master
self.url = reverse('instructor_dashboard_legacy', kwargs={'course_id': self.course.id.to_deprecated_string()})
# URL for email view
self.email_link = '<a href="#" onclick="goto(\'Email\')" class="None">Email</a>'

42
lms/djangoapps/instructor/tests/test_legacy_enrollment.py
View File

@@ -52,11 +52,7 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
course = self.course
# Run the Un-enroll students command
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
response = self.client.post(
url,
{
@@ -88,11 +84,7 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
course = self.course
# Run the Enroll students command
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student1_1@test.com, student1_2@test.com', 'auto_enroll': 'on'})
# Check the page output
@@ -137,11 +129,7 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
course = self.course
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student0@test.com', 'auto_enroll': 'on'})
self.assertContains(response, '<td>student0@test.com</td>')
self.assertContains(response, '<td>already enrolled</td>')
@@ -154,11 +142,7 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
course = self.course
# Run the Enroll students command
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student2_1@test.com, student2_2@test.com'})
# Check the page output
@@ -215,11 +199,7 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
# Create activated, but not enrolled, user
UserFactory.create(username="student3_0", email="student3_0@test.com", first_name='Autoenrolled')
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student3_0@test.com, student3_1@test.com, student3_2@test.com', 'auto_enroll': 'on', 'email_students': 'on'})
# Check the page output
@@ -274,11 +254,7 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
cea = CourseEnrollmentAllowed(email='student4_0@test.com', course_id=course.id)
cea.save()
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
response = self.client.post(url, {'action': 'Unenroll multiple students', 'multiple_students': 'student4_0@test.com, student2@test.com, student3@test.com', 'email_students': 'on'})
# Check the page output
@@ -325,11 +301,7 @@ class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase)
# Create activated, but not enrolled, user
UserFactory.create(username="student5_0", email="student5_0@test.com", first_name="ShibTest", last_name="Enrolled")
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student5_0@test.com, student5_1@test.com', 'auto_enroll': 'on', 'email_students': 'on'})
# Check the page output

42
lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
View File

@@ -68,11 +68,7 @@ class TestInstructorDashboardForumAdmin(ModuleStoreTestCase, LoginEnrollmentTest
def test_add_forum_admin_users_for_unknown_user(self):
course = self.toy
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
username = 'unknown'
for action in ['Add', 'Remove']:
for rolename in FORUM_ROLES:
@@ -81,11 +77,7 @@ class TestInstructorDashboardForumAdmin(ModuleStoreTestCase, LoginEnrollmentTest
def test_add_forum_admin_users_for_missing_roles(self):
course = self.toy
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
username = 'u1'
for action in ['Add', 'Remove']:
for rolename in FORUM_ROLES:
@@ -95,11 +87,7 @@ class TestInstructorDashboardForumAdmin(ModuleStoreTestCase, LoginEnrollmentTest
def test_remove_forum_admin_users_for_missing_users(self):
course = self.toy
self.initialize_roles(course.id)
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
username = 'u1'
action = 'Remove'
for rolename in FORUM_ROLES:
@@ -109,11 +97,7 @@ class TestInstructorDashboardForumAdmin(ModuleStoreTestCase, LoginEnrollmentTest
def test_add_and_remove_forum_admin_users(self):
course = self.toy
self.initialize_roles(course.id)
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
username = 'u2'
for rolename in FORUM_ROLES:
response = self.client.post(url, {'action': action_name('Add', rolename), FORUM_ADMIN_USER[rolename]: username})
@@ -126,11 +110,7 @@ class TestInstructorDashboardForumAdmin(ModuleStoreTestCase, LoginEnrollmentTest
def test_add_and_read_forum_admin_users(self):
course = self.toy
self.initialize_roles(course.id)
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
username = 'u2'
for rolename in FORUM_ROLES:
# perform an add, and follow with a second identical add:
@@ -142,11 +122,7 @@ class TestInstructorDashboardForumAdmin(ModuleStoreTestCase, LoginEnrollmentTest
def test_add_nonstaff_forum_admin_users(self):
course = self.toy
self.initialize_roles(course.id)
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
username = 'u1'
rolename = FORUM_ROLE_ADMINISTRATOR
response = self.client.post(url, {'action': action_name('Add', rolename), FORUM_ADMIN_USER[rolename]: username})
@@ -155,11 +131,7 @@ class TestInstructorDashboardForumAdmin(ModuleStoreTestCase, LoginEnrollmentTest
def test_list_forum_admin_users(self):
course = self.toy
self.initialize_roles(course.id)
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': course.id.to_deprecated_string()})
username = 'u2'
added_roles = [FORUM_ROLE_STUDENT] # u2 is already added as a student to the discussion forums
self.assertTrue(has_forum_access(username, course.id, 'Student'))

6
lms/djangoapps/instructor/tests/test_legacy_gradebook.py
View File

@@ -68,14 +68,10 @@ class TestGradebook(ModuleStoreTestCase):
module_state_key=item.location
)
<<<<<<< HEAD
self.response = self.client.get(reverse(
'gradebook',
'gradebook_legacy',
args=(self.course.id.to_deprecated_string(),)
))
=======
self.response = self.client.get(reverse('gradebook_legacy', args=(self.course.id,)))
>>>>>>> edx/master
def test_response_code(self):
self.assertEquals(self.response.status_code, 200)

6
lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
View File

@@ -45,11 +45,7 @@ class TestRawGradeCSV(TestSubmittingProblems):
resp = self.submit_question_answer('p2', {'2_1': 'Correct'})
self.assertEqual(resp.status_code, 200)
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': self.course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': self.course.id.to_deprecated_string()})
msg = "url = {0}\n".format(url)
response = self.client.post(url, {'action': 'Download CSV of all RAW grades'})
msg += "instructor dashboard download raw csv grades: response = '{0}'\n".format(response)

6
lms/djangoapps/instructor/tests/test_legacy_reset.py
View File

@@ -61,11 +61,7 @@ class InstructorResetStudentStateTest(ModuleStoreTestCase, LoginEnrollmentTestCa
sub_api.set_score(submission['uuid'], 1, 2)
# Delete student state using the instructor dash
<<<<<<< HEAD
url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
=======
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': self.course.id})
>>>>>>> edx/master
url = reverse('instructor_dashboard_legacy', kwargs={'course_id': self.course.id.to_deprecated_string()})
response = self.client.post(url, {
'action': 'Delete student state for module',
'unique_student_identifier': self.student.email,

6
lms/djangoapps/instructor/views/api.py
View File

@@ -1082,15 +1082,11 @@ def send_email(request, course_id):
# Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
instructor_task.api.submit_bulk_course_email(request, course_id, email.id) # pylint: disable=E1101
<<<<<<< HEAD
response_payload = {'course_id': course_id.to_deprecated_string()}
=======
response_payload = {
'course_id': course_id,
'course_id': course_id.to_deprecated_string(),
'success': True,
}
>>>>>>> edx/master
return JsonResponse(response_payload)

26
lms/djangoapps/instructor/views/instructor_dashboard.py
View File

@@ -83,11 +83,7 @@ def instructor_dashboard_2(request, course_id):
context = {
'course': course,
<<<<<<< HEAD
'old_dashboard_url': reverse('instructor_dashboard', kwargs={'course_id': course_key.to_deprecated_string()}),
=======
'old_dashboard_url': reverse('instructor_dashboard_legacy', kwargs={'course_id': course_id}),
>>>>>>> edx/master
'old_dashboard_url': reverse('instructor_dashboard_legacy', kwargs={'course_id': course_id.to_deprecated_string()}),
'studio_url': studio_url,
'sections': sections,
'disable_buttons': disable_buttons,
@@ -169,21 +165,13 @@ def _section_student_admin(course_key, access):
'section_key': 'student_admin',
'section_display_name': _('Student Admin'),
'access': access,
<<<<<<< HEAD
'get_student_progress_url_url': reverse('get_student_progress_url', kwargs={'course_id': course_key.to_deprecated_string()}),
'enrollment_url': reverse('students_update_enrollment', kwargs={'course_id': course_key.to_deprecated_string()}),
'reset_student_attempts_url': reverse('reset_student_attempts', kwargs={'course_id': course_key.to_deprecated_string()}),
'rescore_problem_url': reverse('rescore_problem', kwargs={'course_id': course_key.to_deprecated_string()}),
'list_instructor_tasks_url': reverse('list_instructor_tasks', kwargs={'course_id': course_key.to_deprecated_string()}),
=======
'is_small_course': is_small_course,
'get_student_progress_url_url': reverse('get_student_progress_url', kwargs={'course_id': course_id}),
'enrollment_url': reverse('students_update_enrollment', kwargs={'course_id': course_id}),
'reset_student_attempts_url': reverse('reset_student_attempts', kwargs={'course_id': course_id}),
'rescore_problem_url': reverse('rescore_problem', kwargs={'course_id': course_id}),
'list_instructor_tasks_url': reverse('list_instructor_tasks', kwargs={'course_id': course_id}),
'spoc_gradebook_url': reverse('spoc_gradebook', kwargs={'course_id': course_id}),
>>>>>>> edx/master
'get_student_progress_url_url': reverse('get_student_progress_url', kwargs={'course_id': course_id.to_deprecated_string()}),
'enrollment_url': reverse('students_update_enrollment', kwargs={'course_id': course_id.to_deprecated_string()}),
'reset_student_attempts_url': reverse('reset_student_attempts', kwargs={'course_id': course_id.to_deprecated_string()}),
'rescore_problem_url': reverse('rescore_problem', kwargs={'course_id': course_id.to_deprecated_string()}),
'list_instructor_tasks_url': reverse('list_instructor_tasks', kwargs={'course_id': course_id.to_deprecated_string()}),
'spoc_gradebook_url': reverse('spoc_gradebook', kwargs={'course_id': course_id.to_deprecated_string()}),
}
return section_data

9
lms/djangoapps/instructor/views/legacy.py
View File

@@ -1038,14 +1038,7 @@ def instructor_dashboard(request, course_id):
'metrics_results': metrics_results,
}
<<<<<<< HEAD
if settings.FEATURES.get('ENABLE_INSTRUCTOR_BETA_DASHBOARD'):
context['beta_dashboard_url'] = reverse(
'instructor_dashboard_2', kwargs={'course_id': course_key.to_deprecated_string()}
)
=======
context['standard_dashboard_url'] = reverse('instructor_dashboard', kwargs={'course_id': course_id})
>>>>>>> edx/master
context['standard_dashboard_url'] = reverse('instructor_dashboard', kwargs={'course_id': course_id.to_deprecated_string()})
return render_to_response('courseware/instructor_dashboard.html', context)