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

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