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

Merge pull request #13344 from edx/diana/forums-permissions-release

Browse Source 
Fix spelling of permission.
This commit is contained in:
Diana Huang
2016-08-29 17:27:48 -04:00
committed by GitHub
parent 885afb7e8c c9a8b59904
commit 24d2b69db6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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))