merged master

plone/app/discussion/profiles/default/actions.xml

@@ -6,7 +6,7 @@
    <property name="title" i18n:translate="">Moderate comments</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${globals_view/navigationRootUrl}/@@moderate-comments</property>
-   <property name="icon_expr">string:${globals_view/navigationRootUrl}/discussionitem_icon.gif</property>
+   <property name="icon_expr">string:${globals_view/navigationRootUrl}/discussionitem_icon.png</property>
    <property name="available_expr">portal/@@moderate-comments-enabled|nothing</property>
    <property name="permissions">
     <element value="Review comments"/>

plone/app/discussion/profiles/default/componentregistry.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<componentregistry>
- <utilities>
-  <utility
-      interface="plone.app.discussion.interfaces.ICommentingTool"
-      object="portal_discussion"
-      />
- </utilities>
-</componentregistry>

plone/app/discussion/profiles/default/controlpanel.xml

@@ -11,7 +11,7 @@
         appId="plone.app.discussion"
         category="Plone"
         condition_expr=""
-        icon_expr="string:${portal_url}/discussionitem_icon.gif"
+        icon_expr="string:${portal_url}/discussionitem_icon.png"
         url_expr="string:${portal_url}/@@discussion-settings"
         visible="True"
         i18n:attributes="title">

plone/app/discussion/profiles/default/metadata.xml

@@ -1,5 +1,5 @@
 <metadata>
- <version>100</version>
+ <version>102</version>
  <dependencies>
   <dependency>profile-plone.app.registry:default</dependency>
  </dependencies>

plone/app/discussion/profiles/default/registry.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
 <registry>
- <records interface="plone.app.discussion.interfaces.IDiscussionSettings" />
-</registry>
+	<records interface="plone.app.discussion.interfaces.IDiscussionSettings">
+		<value key="edit_comment_enabled">False</value>
+	</records>
+</registry>

plone/app/discussion/profiles/default/rolemap.xml

@@ -3,7 +3,18 @@
     <permissions>
         <permission name="Review comments" acquire="True">
             <role name="Manager"/>
-	    <role name="Site Administrator"/>
+	        <role name="Site Administrator"/>
+            <role name="Reviewer"/>
+        </permission>
+        <permission name="Edit comments" acquire="True">
+            <role name="Manager"/>
+	        <role name="Site Administrator"/>
+            <role name="Reviewer"/>
+            <role name="Owner"/>
+        </permission>
+        <permission name="Delete comments" acquire="True">
+            <role name="Manager"/>
+            <role name="Site Administrator"/>
             <role name="Reviewer"/>
         </permission>
         <permission name="Reply to item" acquire="False">

plone/app/discussion/profiles/default/toolset.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<tool-setup>
- <required tool_id="portal_discussion"
-           class="plone.app.discussion.tool.CommentingTool"/>
-</tool-setup>

plone/app/discussion/profiles/default/types/Discussion_Item.xml

@@ -3,7 +3,7 @@
    i18n:domain="plone" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title" i18n:translate="">Comment</property>
  <property name="description" i18n:translate="">Comments added to a content item.</property>
- <property name="content_icon">discussionitem_icon.gif</property>
+ <property name="content_icon">discussionitem_icon.png</property>
  <property name="content_meta_type">Discussion Item</property>
  <property name="product"></property>
  <property name="factory">plone.Comment</property>

plone/app/discussion/profiles/default/workflows.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<object name="portal_workflow">
- <object name="comment_review_workflow" meta_type="Workflow"/>
- <bindings>
-  <type type_id="Discussion Item">
+<object name="portal_workflow" meta_type="Plone Workflow Tool">
+  <object name="comment_review_workflow" meta_type="Workflow"/>
+  <bindings>
+    <type type_id="Discussion Item">
       <bound-workflow workflow_id="one_state_workflow" />
-  </type>
- </bindings>
+    </type>
+  </bindings>
 </object>