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

Reverted using cached permissions for disciussion

common/templates/discussion/_discussion_course.html

 <%! from django.utils.translation import ugettext as _ %>
-<%! from django_comment_client.permissions import cached_has_permission %>
+<%! from django_comment_client.permissions import has_permission %>
 
 <%namespace name='static' file='../static_content.html'/>
 
@@ -13,7 +13,7 @@
 
 <div class="discussion-course">
 
-  % if enable_new_post_btn and cached_has_permission(user, "create_thread", course_id):
+  % if enable_new_post_btn and has_permission(user, "create_thread", course_id):
   <div class="discussion-course-new right">
     <a href="#" class="new-post-btn" role="button"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a>
   </div>

common/templates/discussion/_discussion_course_navigation.html

 <%! from django.utils.translation import ugettext as _ %>
-<%! from django_comment_client.permissions import cached_has_permission %>
+<%! from django_comment_client.permissions import has_permission %>
 <%inherit file="../courseware/course_navigation.html" />
 
 <%block name="extratabs">
-% if cached_has_permission(user, 'create_thread', course.id):
+% if has_permission(user, 'create_thread', course.id):
     <li class="right"><a href="#" class="new-post-btn" role="button"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a></li>
 % endif
 </%block>

common/templates/discussion/_discussion_inline.html

 <%! from django.utils.translation import ugettext as _ %>
-<%! from django_comment_client.permissions import cached_has_permission %>
+<%! from django_comment_client.permissions import has_permission %>
 <%include file="_underscore_templates.html" />
 
 <%namespace name='static' file='../static_content.html'/>
@@ -14,7 +14,7 @@
 
 <div class="discussion-module" data-discussion-id="${discussion_id | h}">
     <a class="discussion-show control-button" href="javascript:void(0)" data-discussion-id="${discussion_id | h}" role="button"><span class="show-hide-discussion-icon"></span><span class="button-text">${_("Show Discussion")}</span></a>
-    % if cached_has_permission(user, 'create_thread', course.id):
+    % if has_permission(user, 'create_thread', course.id):
         <a href="#" class="new-post-btn" role="button"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a>
     % endif
 </div>

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 cached_has_permission %>
+<%! from django_comment_client.permissions import 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 cached_has_permission(user, 'create_comment', course.id):
+                % if course is UNDEFINED or 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 cached_has_permission(user, 'create_comment', course.id):
+                % if course is UNDEFINED or 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 cached_has_permission(user, 'create_sub_comment', course.id):
+            % if course is UNDEFINED or 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>