Discussion board viewer now obeys permissions.

mikemintz · Apr 24, 2013 · e90c15c · e90c15c
1 parent 802c740
commit e90c15c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/deme_django/modules/discussionboard/templates/discussionboard/show.html b/deme_django/modules/discussionboard/templates/discussionboard/show.html
@@ -16,7 +16,13 @@
     {% for discussion in discussions %}
     <tr>
         <td>
-            <a href="{% url item_url viewer="discussioncomment",action="show",noun=discussion.comment.pk %}?discussion_board={{ item.pk }}">{{ discussion.comment.name|truncatewords:10 }}</a>
+            <a href="{% url item_url viewer="discussioncomment",action="show",noun=discussion.comment.pk %}?discussion_board={{ item.pk }}">
+                {% ifagentcan 'view Item.name' discussion.comment %}
+                    {{ discussion.comment.name|truncatewords:10 }}
+                {% else %}
+                    Comment {{ discussion.comment.pk }}
+                {% endifagentcan %}
+            </a>
             <br />
             <nobr>By {% viewable_name discussion.comment.creator %}</nobr>
         </td>
@@ -25,13 +31,21 @@
         </td>
         <td>
             {% if discussion.last_post %}
-                <nobr>By {% viewable_name discussion.last_post.creator %}</nobr>
-                <br />
-                <nobr>{{ discussion.last_post.created_at }}</nobr>
+                {% ifagentcan 'view Item.creator' discussion.last_post %}
+                    <nobr>By {% viewable_name discussion.last_post.creator %}</nobr>
+                {% endifagentcan %}
+                {% ifagentcan 'view Item.created_at' discussion.last_post %}
+                    <br />
+                    <nobr>{{ discussion.last_post.created_at }}</nobr>
+                {% endifagentcan %}
             {% else %}
-                <nobr>By {% viewable_name discussion.comment.creator %}</nobr>
-                <br />
-                <nobr>{{ discussion.comment.created_at }}</nobr>
+                {% ifagentcan 'view Item.creator' discussion.comment %}
+                    <nobr>By {% viewable_name discussion.comment.creator %}</nobr>
+                {% endifagentcan %}
+                {% ifagentcan 'view Item.created_at' discussion.comment %}
+                    <br />
+                    <nobr>{{ discussion.comment.created_at }}</nobr>
+                {% endifagentcan %}
             {% endif %}
         </td>
     </tr>

diff --git a/deme_django/modules/discussionboard/templatetags/discussion_extras.py b/deme_django/modules/discussionboard/templatetags/discussion_extras.py
@@ -36,7 +36,8 @@ def add_comment_to_div(comment_info, parents):
             result.append(u'<div><input type="submit" value="Submit reply" /></div><input type="hidden" name="item" value="%s" /><input type="hidden" name="item_version_number" value="%s" />' % (comment.pk, comment.version_number))
             result.append(u'</form></div>')
             result.append(u'<div style="margin-bottom: 10px;">')
-            result.append(u'<div style="float: right;"><a href="#" onclick="$(\'#comment%s\').show(); return false;" class="fg-button ui-widget ui-state-default fg-button-icon-left ui-corner-all" style="background: #ffcc99;"><span class="ui-icon ui-icon-comment"></span>Reply</a></div>' % comment.pk)
+            if agentcan_helper(context, 'comment_on', comment):
+                result.append(u'<div style="float: right;"><a href="#" onclick="$(\'#comment%s\').show(); return false;" class="fg-button ui-widget ui-state-default fg-button-icon-left ui-corner-all" style="background: #ffcc99;"><span class="ui-icon ui-icon-comment"></span>Reply</a></div>' % comment.pk)
             if agentcan_helper(context, 'view Item.created_at', comment):
                 result.append('<div style="font-style: italic;">%s</div>' % comment.created_at.strftime("%a %b %d %Y %I:%M %p"))
             result.append(u'<div style="clear: both;"></div>')