Merge pull request #681 from plone/fix-behavior-interfaces

Fix ILeadImageBehavior and IRichTextBehavior interfaces were the name change was forgotten.

CHANGES.rst

@@ -473,7 +473,7 @@ Bug fixes:
 New features:
 
 
-- Support ILeadImage behavior when display collection album view.
+- Support ILeadImageBehavior when display collection album view.
   [rodfersou] (#524)
 - Add more log-messages during migration from AT to DX.
   [pbauer] (#526)
@@ -552,7 +552,7 @@ Bug fixes:
 
 Breaking changes:
 
-- ILeadImage and IRichText behaviors now have proper "Marker"-Interfaces.
+- ILeadImageBehavior and IRichTextBehavior behaviors now have proper "Marker"-Interfaces.
   As this was only possible by renaming the schema adapter to *Behavior* to
   not break with implementations inside the collective, the FTI-behavior-definition
   has changed:

docs/README.rst

@@ -79,7 +79,7 @@ You have several options:
     <?xml version="1.0"?>
     <object name="Folder" meta_type="Dexterity FTI">
      <property name="behaviors" purge="False">
-      <element value="plone.app.contenttypes.behaviors.leadimage.ILeadImage"/>
+      <element value="plone.leadimage"/>
      </property>
     </object>
 
@@ -91,7 +91,7 @@ You have several options:
     <object name="Folder" meta_type="Dexterity FTI">
      <property name="model_file">your.package.content:folder.xml</property>
      <property name="behaviors" purge="False">
-      <element value="plone.app.contenttypes.behaviors.leadimage.ILeadImage"/>
+      <element value="plone.leadimage"/>
      </property>
     </object>
 

news/681.bugfix

@@ -0,0 +1,2 @@
+Fix ILeadImageBehavior and IRichTextBehavior interfaces were the name change was forgotten.
+[thet]

plone/app/contenttypes/behaviors/viewlets.py

@@ -1,10 +1,10 @@
-from plone.app.contenttypes.behaviors.leadimage import ILeadImage
+from plone.app.contenttypes.behaviors.leadimage import ILeadImageBehavior
 from plone.app.layout.viewlets import ViewletBase
 
 
 class LeadImageViewlet(ViewletBase):
     """A simple viewlet which renders leadimage"""
 
     def update(self):
-        self.context = ILeadImage(self.context)
-        self.available = True if self.context.image else False
+        behavior = ILeadImageBehavior(self.context)
+        self.available = True if behavior.image else False

plone/app/contenttypes/indexers.py

@@ -1,6 +1,6 @@
 from Acquisition import aq_base
 from logging import getLogger
-from plone.app.contenttypes.behaviors.richtext import IRichText
+from plone.app.contenttypes.behaviors.richtext import IRichTextBehavior
 from plone.app.contenttypes.interfaces import ICollection
 from plone.app.contenttypes.interfaces import IDocument
 from plone.app.contenttypes.interfaces import IFile
@@ -40,7 +40,7 @@ def _unicode_save_string_concat(*args):
 
 def SearchableText(obj):
     text = ""
-    richtext = IRichText(obj, None)
+    richtext = IRichTextBehavior(obj, None)
     if richtext:
         textvalue = richtext.text
         if IRichTextValue.providedBy(textvalue):