merged master

This commit is contained in:
Jens W. Klein
2014-08-17 04:48:44 +02:00
140 changed files with 8593 additions and 5378 deletions
+13 -2
View File
@@ -71,13 +71,24 @@
permission="zope2.View"
/>
<!-- Delete comment views -->
<!-- Edit comment view -->
<browser:page
for="plone.app.discussion.interfaces.IComment"
name="edit-comment"
layer="..interfaces.IDiscussionLayer"
class=".comment.EditComment"
permission="plone.app.discussion.EditComments"
/>
<!-- Delete comment views
has conditional security dependent on controlpanel settings.
-->
<browser:page
for="plone.app.discussion.interfaces.IComment"
name="moderate-delete-comment"
layer="..interfaces.IDiscussionLayer"
class=".moderation.DeleteComment"
permission="plone.app.discussion.ReviewComments"
permission="plone.app.discussion.DeleteComments"
/>
<browser:page