Commit 39639013 by E. Kolpakov Committed by Zia Fazal

Reverted to using non cached permissions check as cached version fails tests…

Reverted to using non cached permissions check as cached version fails tests (and there are no clean way to make it pass)
parent 6ee47671
<%! from django.utils.translation import ugettext as _ %> <%! 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" /> <%inherit file="../courseware/course_navigation.html" />
<%block name="extratabs"> <%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 fa fa-edit new-post-icon"></span>${_("New Post")}</a></li> <li class="right"><a href="#" class="new-post-btn" role="button"><span class="icon fa fa-edit new-post-icon"></span>${_("New Post")}</a></li>
% endif % endif
</%block> </%block>
<%! from django.utils.translation import ugettext as _ %> <%! 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" /> <%include file="_underscore_templates.html" />
<%namespace name='static' file='../static_content.html'/> <%namespace name='static' file='../static_content.html'/>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="discussion-module" data-discussion-id="${discussion_id | h}"> <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> <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 fa fa-edit new-post-icon"></span>${_("New Post")}</a> <a href="#" class="new-post-btn" role="button"><span class="icon fa fa-edit new-post-icon"></span>${_("New Post")}</a>
% endif % endif
</div> </div>
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
<%! from django.template.defaultfilters import escapejs %> <%! 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'/> <%namespace name='static' file='../static_content.html'/>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
<div class="post-extended-content"> <div class="post-extended-content">
<div class="response-count"/> <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"> <div class="add-response">
<button class="button add-response-btn"> <button class="button add-response-btn">
<i class="icon fa fa-reply"></i> <i class="icon fa fa-reply"></i>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="post-status-closed bottom-post-status" style="display: none"> <div class="post-status-closed bottom-post-status" style="display: none">
${_("This thread is closed.")} ${_("This thread is closed.")}
</div> </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 %>'}"> <form class="discussion-reply-new" data-id="${'<%- id %>'}">
<h4>${_("Post a response:")}</h4> <h4>${_("Post a response:")}</h4>
<ul class="discussion-errors"></ul> <ul class="discussion-errors"></ul>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</a> </a>
<ol class="comments"> <ol class="comments">
<li class="new-comment"> <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 %>'}"> <form class="comment-form" data-id="${'<%- wmdId %>'}">
<ul class="discussion-errors"></ul> <ul class="discussion-errors"></ul>
<label class="sr" for="add-new-comment">${_("Add a comment")}</label> <label class="sr" for="add-new-comment">${_("Add a comment")}</label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment