From eb0e09d63ff4d02de6d965cc83fdceed41dd1e95 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Fri, 1 Nov 2013 14:15:23 -0400 Subject: [PATCH] Clean up some instructor dash code --- lms/djangoapps/instructor/access.py | 2 +- .../instructor/tests/test_access.py | 22 +++++++++---------- lms/djangoapps/instructor/views/api.py | 12 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lms/djangoapps/instructor/access.py b/lms/djangoapps/instructor/access.py index dfe8eed23b..e079ff87f6 100644 --- a/lms/djangoapps/instructor/access.py +++ b/lms/djangoapps/instructor/access.py @@ -82,7 +82,7 @@ def _change_access(course, user, level, action): raise ValueError("unrecognized action '{}'".format(action)) -def update_forum_role_membership(course_id, user, rolename, action): +def update_forum_role(course_id, user, rolename, action): """ Change forum access of user. diff --git a/lms/djangoapps/instructor/tests/test_access.py b/lms/djangoapps/instructor/tests/test_access.py index 1874e88f22..6a70f64fdc 100644 --- a/lms/djangoapps/instructor/tests/test_access.py +++ b/lms/djangoapps/instructor/tests/test_access.py @@ -17,7 +17,7 @@ from django_comment_common.models import (Role, from instructor.access import (allow_access, revoke_access, list_with_level, - update_forum_role_membership) + update_forum_role) @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE) @@ -148,44 +148,44 @@ class TestInstructorAccessForum(ModuleStoreTestCase): def test_allow(self): user = UserFactory.create() - update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') + update_forum_role(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') self.assertIn(user, self.mod_role.users.all()) def test_allow_twice(self): user = UserFactory.create() - update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') + update_forum_role(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') self.assertIn(user, self.mod_role.users.all()) - update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') + update_forum_role(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') self.assertIn(user, self.mod_role.users.all()) @raises(Role.DoesNotExist) def test_allow_badrole(self): user = UserFactory.create() - update_forum_role_membership(self.course.id, user, 'robot-not-a-real-role', 'allow') + update_forum_role(self.course.id, user, 'robot-not-a-real-role', 'allow') def test_revoke(self): user = self.moderators[0] - update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') + update_forum_role(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') self.assertNotIn(user, self.mod_role.users.all()) def test_revoke_twice(self): user = self.moderators[0] - update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') + update_forum_role(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') self.assertNotIn(user, self.mod_role.users.all()) - update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') + update_forum_role(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') self.assertNotIn(user, self.mod_role.users.all()) def test_revoke_notallowed(self): user = UserFactory() - update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') + update_forum_role(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') self.assertNotIn(user, self.mod_role.users.all()) @raises(Role.DoesNotExist) def test_revoke_badrole(self): user = self.moderators[0] - update_forum_role_membership(self.course.id, user, 'robot-not-a-real-role', 'allow') + update_forum_role(self.course.id, user, 'robot-not-a-real-role', 'allow') @raises(ValueError) def test_bad_mode(self): user = UserFactory() - update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'robot-not-a-mode') + update_forum_role(self.course.id, user, FORUM_ROLE_MODERATOR, 'robot-not-a-mode') diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py index 3b0f6479c7..2364e85cc2 100644 --- a/lms/djangoapps/instructor/views/api.py +++ b/lms/djangoapps/instructor/views/api.py @@ -35,7 +35,7 @@ from instructor_task.views import get_task_completion_info import instructor.enrollment as enrollment from instructor.enrollment import enroll_email, unenroll_email from instructor.views.tools import strip_if_string, get_student_from_identifier -import instructor.access as access +from instructor.access import list_with_level, allow_access, revoke_access, update_forum_role import analytics.basic import analytics.distributions import analytics.csvs @@ -294,9 +294,9 @@ def modify_access(request, course_id): ) if action == 'allow': - access.allow_access(course, user, rolename) + allow_access(course, user, rolename) elif action == 'revoke': - access.revoke_access(course, user, rolename) + revoke_access(course, user, rolename) else: return HttpResponseBadRequest("unrecognized action '{}'".format(action)) @@ -352,7 +352,7 @@ def list_course_role_members(request, course_id): response_payload = { 'course_id': course_id, - rolename: map(extract_user_info, access.list_with_level( + rolename: map(extract_user_info, list_with_level( course, rolename )), } @@ -381,7 +381,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') -def get_students_features(request, course_id, csv=False): # pylint: disable=W0613 +def get_students_features(request, course_id, csv=False): # pylint: disable=W0613, W0621 """ Respond with json which contains a summary of all enrolled students profile information. @@ -882,7 +882,7 @@ def update_forum_role_membership(request, course_id): return HttpResponseBadRequest("Cannot revoke instructor forum admin privelages.") try: - access.update_forum_role_membership(course_id, user, rolename, action) + update_forum_role(course_id, user, rolename, action) except Role.DoesNotExist: return HttpResponseBadRequest("Role does not exist.")