Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol

lms/djangoapps/django_comment_client/permissions.py

@@ -77,7 +77,7 @@ VIEW_PERMISSIONS = {
     'openclose_thread'  :       ('openclose_thread'),
     'create_sub_comment':       (['create_sub_comment', 'open']),
     'delete_comment'    :       ('delete_comment'),
-    'vote_for_commend'  :       (['vote', 'open']),
+    'vote_for_comment'  :       (['vote', 'open']),
     'undo_vote_for_comment':    (['unvote', 'open']),
     'vote_for_thread'   :       (['vote', 'open']),
     'undo_vote_for_thread':     (['unvote', 'open']),

lms/templates/discussion/_thread.html

@@ -89,12 +89,9 @@
     ${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")}
     ${render_link("discussion-link discussion-edit", "Edit")}
 
-    % if type == "thread":
+    % if type == 'thread':
       <a class="discussion-link discussion-permanent-link" href="${reverse('django_comment_client.forum.views.single_thread', kwargs={'discussion_id':discussion_id, 'thread_id':content['id'], 'course_id':course_id})}">Permanent Link</a>
-    % else:
-      <a class="discussion-link discussion-permanent-link" href="${reverse('django_comment_client.forum.views.single_thread', kwargs={'discussion_id':discussion_id, 'thread_id':content['thread_id'], 'course_id':course_id})}#${content['id']}">Permanent Link</a>
     % endif
-
     <span class="discussion-endorse-control">
       % if content.get('endorsed', False):
         <input type="checkbox" checked="checked" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}" />