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

Reorder transformers to fix MA-1981.

Browse Source
This commit is contained in:
Nimisha Asthagiri
2016-01-25 15:05:36 -05:00
parent 55b7fa4924
commit 3a6fbae60c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/course_api/blocks/api.py
View File

@@ -52,9 +52,10 @@ def get_blocks(
)
# list of transformers to apply, adding user-specific ones if user is provided
transformers = [blocks_api_transformer]
transformers = []
if user is not None:
transformers += COURSE_BLOCK_ACCESS_TRANSFORMERS + [ProctoredExamTransformer()]
transformers += [blocks_api_transformer]
blocks = get_course_blocks(
user,

14
lms/djangoapps/course_api/blocks/tests/test_api.py
View File

@@ -42,3 +42,17 @@ class TestGetBlocks(SharedModuleStoreTestCase):
def test_no_user(self):
blocks = get_blocks(self.request, self.course.location)
self.assertIn(unicode(self.html_block.location), blocks['blocks'])
def test_access_before_api_transformer_order(self):
"""
Tests the order of transformers: access checks are made before the api
transformer is applied.
"""
blocks = get_blocks(self.request, self.course.location, self.user, nav_depth=5, requested_fields=['nav_depth'])
vertical_block = self.store.get_item(self.course.id.make_usage_key('vertical', 'vertical_x1a'))
problem_block = self.store.get_item(self.course.id.make_usage_key('problem', 'problem_x1a_1'))
vertical_descendants = blocks['blocks'][unicode(vertical_block.location)]['descendants']
self.assertIn(unicode(problem_block.location), vertical_descendants)
self.assertNotIn(unicode(self.html_block.location), vertical_descendants)