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

Merge pull request #27487 from edx/mikix/fix-gated-content-check

Browse Source 
fix: properly set contains_gated_content field on xblocks again
This commit is contained in:
Michael Terry
2021-05-03 11:50:40 -04:00
committed by GitHub
parent 912f2fa431 6e52aafc8c
commit 12e9763446
6 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/lib/xmodule/xmodule/modulestore/tests/factories.py
View File

@@ -412,6 +412,7 @@ class ItemFactory(XModuleFactory):
module.submission_start = submission_start
if submission_end:
module.submission_end = submission_end
store.update_item(module, user_id)
# VS[compat] cdodge: This is a hack because static_tabs also have references from the course module, so
# if we add one then we need to also add it to the policy information (i.e. metadata)

1
lms/djangoapps/course_api/blocks/serializers.py
View File

@@ -103,6 +103,7 @@ FIELDS_ALLOWED_IN_AUTH_DENIED_CONTENT = [
"descendants",
"authorization_denial_reason",
"authorization_denial_message",
'contains_gated_content',
]

12
lms/djangoapps/course_home_api/outline/v1/tests/test_views.py
View File

@@ -304,17 +304,11 @@ class OutlineTabTestViews(BaseCourseHomeTests):
chapter = ItemFactory.create(category='chapter', parent_location=course.location)
sequential = ItemFactory.create(display_name='Test', category='sequential', graded=True, has_score=True,
parent_location=chapter.location)
problem1 = ItemFactory.create(category='problem', graded=True, has_score=True,
parent_location=sequential.location)
problem2 = ItemFactory.create(category='problem', graded=True, has_score=True,
parent_location=sequential.location)
ItemFactory.create(category='problem', graded=True, has_score=True, parent_location=sequential.location)
ItemFactory.create(category='problem', graded=True, has_score=True, parent_location=sequential.location)
sequential2 = ItemFactory.create(display_name='Ungraded', category='sequential',
parent_location=chapter.location)
problem3 = ItemFactory.create(category='problem', parent_location=sequential2.location)
course.children = [chapter]
chapter.children = [sequential, sequential2]
sequential.children = [problem1, problem2]
sequential2.children = [problem3]
ItemFactory.create(category='problem', parent_location=sequential2.location)
url = reverse('course-home-outline-tab', args=[course.id])
CourseEnrollment.enroll(self.user, course.id)

2
openedx/core/djangoapps/schedules/tests/test_content_highlights.py
View File

@@ -166,7 +166,7 @@ class TestContentHighlights(ModuleStoreTestCase): # lint-amnesty, pylint: disab
mock_get_module.return_value = None
with self.store.bulk_operations(self.course_key):
self._create_chapter(highlights='Test highlight')
self._create_chapter(highlights=['Test highlight'])
with self.assertRaisesRegex(CourseUpdateDoesNotExist, 'Course module .* not found'):
get_week_highlights(self.user, self.course_key, 1)

4
openedx/features/content_type_gating/block_transformers.py
View File

@@ -62,7 +62,9 @@ class ContentTypeGateTransformer(BlockStructureTransformer):
block_key, UserPartitionTransformer, 'merged_group_access', None
)
if merged_access:
current_access = merged_access.get_allowed_groups()
# merged_access holds a dictionary of sets, but group_access is a dictionary of lists, so we convert here
# (sets seem like a better format for this, but existing code already expects lists)
current_access = {p: list(g) for (p, g) in merged_access.get_allowed_groups().items()}
else:
# This fallback code has a bug if UserPartitionTranformer is not being used -- it does not consider
# inheritance from parent blocks. This is why our class docstring recommends UserPartitionTranformer.

31
openedx/features/content_type_gating/tests/test_access.py
View File

@@ -124,20 +124,23 @@ def _assert_block_is_gated(block, is_gated, user, course, request_factory, has_u
assert 'content-paywall' not in content
fake_request = request_factory.get('')
with patch('lms.djangoapps.course_api.blocks.api.is_request_from_mobile_app', return_value=False):
requested_fields = ['display_name', 'block_id', 'student_view_url', 'student_view_data']
blocks = get_blocks(fake_request, course.location, user=user, requested_fields=requested_fields, student_view_data=['html'])
course_api_block = blocks['blocks'][str(block.location)]
if is_gated:
assert 'authorization_denial_reason' in course_api_block
assert "display_name" in course_api_block
assert "block_id" in course_api_block
assert "student_view_url" in course_api_block
assert "student_view_data" not in course_api_block
else:
assert 'authorization_denial_reason' not in course_api_block
if block.category == 'html':
assert 'student_view_data' in course_api_block
requested_fields = ['block_id', 'contains_gated_content', 'display_name', 'student_view_data', 'student_view_url']
blocks = get_blocks(fake_request, course.location, user=user, requested_fields=requested_fields,
student_view_data=['html'])
course_api_block = blocks['blocks'][str(block.location)]
assert course_api_block.get('contains_gated_content', False) == is_gated
if is_gated:
assert 'authorization_denial_reason' in course_api_block
assert 'block_id' in course_api_block
assert 'display_name' in course_api_block
assert 'student_view_data' not in course_api_block
assert 'student_view_url' in course_api_block
else:
assert 'authorization_denial_reason' not in course_api_block
if block.category == 'html':
assert 'student_view_data' in course_api_block
def _assert_block_is_empty(block, user_id, course, request_factory):