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

Merge pull request #13359 from edx/release

Browse Source 
Merging rc/2016-08-31 into master
This commit is contained in:
Douglas Hall
2016-08-31 11:41:51 -04:00
committed by GitHub
parent 4954928215 27f263e4b4
commit f915befe93
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cms/djangoapps/contentstore/views/course.py
View File

@@ -990,7 +990,11 @@ def settings_handler(request, course_key_string):
about_page_editable = not marketing_site_enabled
enrollment_end_editable = GlobalStaff().has_user(request.user) or not marketing_site_enabled
short_description_editable = settings.FEATURES.get('EDITABLE_SHORT_DESCRIPTION', True)
short_description_editable = configuration_helpers.get_value_for_org(
course_module.location.org,
'EDITABLE_SHORT_DESCRIPTION',
settings.FEATURES.get('EDITABLE_SHORT_DESCRIPTION', True)
)
self_paced_enabled = SelfPacedConfiguration.current().enabled
settings_context = {

6
lms/djangoapps/courseware/tests/test_discussion_xblock.py
View File

@@ -176,13 +176,13 @@ class TestViews(TestDiscussionXBlock):
permission_dict = {
'create_thread': permissions[0],
'create_comment': permissions[1],
'create_subcomment': permissions[2]
'create_sub_comment': permissions[2]
}
expected_permissions = {
'can_create_thread': permission_dict['create_thread'],
'can_create_comment': permission_dict['create_comment'],
'can_create_subcomment': permission_dict['create_subcomment'],
'can_create_subcomment': permission_dict['create_sub_comment'],
}
self.block.has_permission = lambda perm: permission_dict[perm]
@@ -236,7 +236,7 @@ class TestTemplates(TestDiscussionXBlock):
permission_dict = {
'create_thread': permissions[0],
'create_comment': permissions[1],
'create_subcomment': permissions[2]
'create_sub_comment': permissions[2]
}
self.block.has_permission = lambda perm: permission_dict[perm]

2
openedx/core/lib/xblock_builtin/xblock_discussion/xblock_discussion.py
View File

@@ -117,7 +117,7 @@ class DiscussionXBlock(XBlock, StudioEditableXBlockMixin, XmlParserMixin):
'course_id': self.course_key,
'can_create_thread': self.has_permission("create_thread"),
'can_create_comment': self.has_permission("create_comment"),
'can_create_subcomment': self.has_permission("create_subcomment"),
'can_create_subcomment': self.has_permission("create_sub_comment"),
}
fragment.add_content(self.runtime.render_template('discussion/_discussion_inline.html', context))