Merge pull request #371 from plone/pa-discussion-coreaddon

move plone.allowdiscussion behavior to plone.app.discussion

news/371.bugfix

@@ -0,0 +1,3 @@
+`plone.app.discussion` is now a core addon.
+The `plone.discussion` behavior class was moved over there.
+[@jensens]

plone/app/dexterity/behaviors/configure.zcml

@@ -113,14 +113,6 @@
       provides=".nextprevious.INextPreviousToggle"
       />
 
-  <!--Allow discussion -->
-  <plone:behavior
-      name="plone.allowdiscussion"
-      title="Allow discussion"
-      description="Allow discussion on this item"
-      provides=".discussion.IAllowDiscussion"
-      />
-
   <adapter factory=".nextprevious.NextPreviousToggle" />
 
   <adapter

plone/app/dexterity/behaviors/discussion.py

@@ -1,39 +1,7 @@
-from plone.app.dexterity import _
-from plone.autoform import directives
-from plone.autoform.interfaces import IFormFieldProvider
-from plone.supermodel import model
-from z3c.form.interfaces import IAddForm
-from z3c.form.interfaces import IEditForm
-from zope import schema
-from zope.interface import provider
-from zope.schema.vocabulary import SimpleTerm
-from zope.schema.vocabulary import SimpleVocabulary
+from zope.deferredimport import deprecated
 
 
-options = SimpleVocabulary(
-    [
-        SimpleTerm(value=True, title=_("Yes")),
-        SimpleTerm(value=False, title=_("No")),
-    ]
+deprecated(
+    "IAllowDiscussion import from here is deprecated. Import from plone.app.discussion.behaviors instead (will be removed in Plone 7)",
+    IAllowDiscussion="plone.app.discussion.behaviors:IAllowDiscussion",
 )
-
-
-@provider(IFormFieldProvider)
-class IAllowDiscussion(model.Schema):
-    model.fieldset(
-        "settings",
-        label=_("Settings"),
-        fields=["allow_discussion"],
-    )
-
-    allow_discussion = schema.Choice(
-        title=_("Allow discussion"),
-        description=_("Allow discussion for this content object."),
-        vocabulary=options,
-        required=False,
-        default=None,
-    )
-
-    directives.omitted("allow_discussion")
-    directives.no_omit(IEditForm, "allow_discussion")
-    directives.no_omit(IAddForm, "allow_discussion")

plone/app/dexterity/tests/test_doctests.py

@@ -6,7 +6,6 @@
 
 
 tests = (
-    "discussion.txt",
     "editing.rst",
     "metadata.txt",
     "nextprevious.txt",

setup.py

@@ -88,7 +88,6 @@
         "test": [
             "plone.app.robotframework",
             "plone.app.testing",
-            "plone.app.discussion",
             "plone.i18n",
             "plone.testing",
             "robotsuite",