Merge pull request #330 from open-craft/eugeny/discussion-backport

Discussion course production deployment issues fix

common/lib/xmodule/xmodule/x_module.py

@@ -1295,6 +1295,7 @@ class DiscussionService(object):
         course_settings = make_course_settings(course)
 
         context = {
+            'user': user,
             'course': course,
             'course_id': course_id,
             'staff_access': has_access(user, 'staff', course),
@@ -1311,11 +1312,7 @@ class DiscussionService(object):
             'sort_preference': user_info['default_sort_key'],
             'cohorted_commentables': cohorted_commentables,
             'is_course_cohorted': course_settings['is_cohorted'],
-            'course_settings': saxutils.escape(json.dumps(course_settings), escapedict),
-            'has_permission_to_create_thread': cached_has_permission(user, "create_thread", course_id),
-            'has_permission_to_create_comment': cached_has_permission(user, "create_comment", course_id),
-            'has_permission_to_create_subcomment': cached_has_permission(user, "create_subcomment", course_id),
-            'has_permission_to_openclose_thread': cached_has_permission(user, "openclose_thread", course_id)
+            'course_settings': saxutils.escape(json.dumps(course_settings), escapedict)
         }
 
         return context

common/templates/discussion/_underscore_templates.html

 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.template.defaultfilters import escapejs %>
-<%! from django_comment_client.permissions import has_permission %>
+<%! from django_comment_client.permissions import cached_has_permission %>
 
 <%namespace name='static' file='../static_content.html'/>
 
@@ -17,7 +17,7 @@
             </div>
             <div class="post-extended-content">
                 <div class="response-count"/>
-                % if course is UNDEFINED or has_permission(user, 'create_comment', course.id):
+                % if course is UNDEFINED or cached_has_permission(user, 'create_comment', course.id):
                 <div class="add-response">
                     <button class="button add-response-btn">
                         <i class="icon icon-reply"></i>
@@ -30,7 +30,7 @@
                 <div class="post-status-closed bottom-post-status" style="display: none">
                   ${_("This thread is closed.")}
                 </div>
-                % if course is UNDEFINED or has_permission(user, 'create_comment', course.id):
+                % if course is UNDEFINED or cached_has_permission(user, 'create_comment', course.id):
                 <form class="discussion-reply-new" data-id="${'<%- id %>'}">
                     <h4>${_("Post a response:")}</h4>
                     <ul class="discussion-errors"></ul>
@@ -78,7 +78,7 @@
     </a>
     <ol class="comments">
         <li class="new-comment">
-            % if course is UNDEFINED or has_permission(user, 'create_sub_comment', course.id):
+            % if course is UNDEFINED or cached_has_permission(user, 'create_sub_comment', course.id):
             <form class="comment-form" data-id="${'<%- wmdId %>'}">
                 <ul class="discussion-errors"></ul>
                 <label class="sr" for="add-new-comment">${_("Add a comment")}</label>