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

fix Close Thread showing for students and empty bracket in search bar

Browse Source
This commit is contained in:
Mike Chen
2012-08-08 14:51:49 -04:00
parent eaf8279451
commit b06e31d2ed
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/django_comment_client/forum/views.py
View File

@@ -149,12 +149,14 @@ def forum_form_discussion(request, course_id, discussion_id):
def get_annotated_content_info(course_id, content, user, is_thread):
return {
permissions = {
'editable': check_permissions_by_view(user, course_id, content, "update_thread" if is_thread else "update_comment"),
'can_reply': check_permissions_by_view(user, course_id, content, "create_comment" if is_thread else "create_sub_comment"),
'can_endorse': check_permissions_by_view(user, course_id, content, "endorse_comment") if not is_thread else False,
'can_delete': check_permissions_by_view(user, course_id, content, "delete_thread" if is_thread else "delete_comment"),
'can_openclose': check_permissions_by_view(user, course_id, content, "openclose_thread") if is_thread else False,
}
return permissions
def get_annotated_content_infos(course_id, thread, user, is_thread=True):
infos = {}

7
lms/djangoapps/django_comment_client/permissions.py
View File

@@ -67,11 +67,10 @@ def check_conditions_permissions(user, permissions, course_id, **kwargs):
VIEW_PERMISSIONS = {
'update_thread' : ['edit_content', ['update_thread', 'is_open', 'author']],
# 'create_comment' : [["create_comment", "is_open"]],
'create_comment' : ["create_comment"],
'update_thread' : ['edit_content', ['update_thread', 'is_open', 'is_author']],
'create_comment' : [["create_comment", "is_open"]],
'delete_thread' : ['delete_thread'],
'update_comment' : ['edit_content', ['update_comment', 'is_open', 'author']],
'update_comment' : ['edit_content', ['update_comment', 'is_open', 'is_author']],
'endorse_comment' : ['endorse_comment'],
'openclose_thread' : ['openclose_thread'],
'create_sub_comment': [['create_sub_comment', 'is_open']],

2
lms/static/coffee/src/discussion/content.coffee
View File

@@ -372,3 +372,5 @@ initializeFollowThread = (thread) ->
$local(".discussion-endorse-control").remove()
if not Discussion.getContentInfo id, 'can_delete'
$local(".discussion-delete").remove()
if not Discussion.getContentInfo id, 'can_openclose'
$local(".discussion-openclose").remove()

2
lms/templates/discussion/_search_bar.html
View File

@@ -12,7 +12,7 @@ def base_url_for_search():
% if query_params.get('tags', None):
<input class="search-input" type="text" value="[${tags}]${text}" id="keywords" autocomplete="off"/>
% else:
<input class="search-input" type="text" value="[${tags}]${text}" id="keywords" autocomplete="off"/>
<input class="search-input" type="text" value="${text}" id="keywords" autocomplete="off"/>
% endif
<div class="discussion-link discussion-search-link" href="javascript:void(0)">Search posts</div>
</form>

2
lms/templates/discussion/_thread.html
View File

@@ -98,7 +98,7 @@
<label class="discussion-link" for="discussion-endorse-${content['id']}">Endorsed</label>
</span>
% if type == "thread" and request.user.is_staff:
% if type == "thread":
% if content['closed']:
<a class="discussion-openclose" id="discussion-openclose-${content['id']}" href="javascript:void(0);">Re-open thread</a>
% else: