Merge pull request #35 from plone/event_newsitem_blocks

Add blocks behavior on Event and NewsItem
plone · Jan 20, 2022 · 1b77398 · 1b77398
2 parents 7e01029 + cbaa42f
commit 1b77398
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -19,6 +19,12 @@ Changelog
 - Remove ``plone.richtext`` behavior from Plone Site, Document, News Item, Events
   [sneridagh]
 
+- Add blocks behavior on Event and NewsItem
+  [nzambello]
+
+- Add preview_image to Event
+  [nzambello]
+
 3.1.0a9 (2022-01-15)
 --------------------
 

diff --git a/src/plone/volto/profiles/default/metadata.xml b/src/plone/volto/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1015</version>
+  <version>1016</version>
   <dependencies>
     <dependency>profile-plone.restapi:blocks</dependency>
   </dependencies>

diff --git a/src/plone/volto/profiles/default/types.xml b/src/plone/volto/profiles/default/types.xml
@@ -3,7 +3,7 @@
   <object name="Plone Site" />
   <object meta_type="Dexterity FTI" name="LRF" />
   <object meta_type="Dexterity FTI" name="Document" />
-  <object meta_type="Dexterity FTI" name="Collection" />
-  <object meta_type="Dexterity FTI" name="News Item" />
   <object meta_type="Dexterity FTI" name="Event" />
+  <object meta_type="Dexterity FTI" name="News Item" />
+  <object meta_type="Dexterity FTI" name="Collection" />
 </object>
diff --git a/src/plone/volto/profiles/default/types/Event.xml b/src/plone/volto/profiles/default/types/Event.xml
@@ -5,5 +5,7 @@
   <property name="klass">plone.volto.content.FolderishEvent</property>
   <property name="behaviors" purge="false">
     <element value="plone.constraintypes"/>
+    <element value="volto.blocks" />
+    <element value="volto.preview_image" />
   </property>
 </object>
diff --git a/src/plone/volto/profiles/default/types/News_Item.xml b/src/plone/volto/profiles/default/types/News_Item.xml
@@ -5,5 +5,6 @@
   <property name="klass">plone.volto.content.FolderishNewsItem</property>
   <property name="behaviors" purge="false">
     <element value="plone.constraintypes"/>
+    <element value="volto.blocks" />
   </property>
 </object>
diff --git a/src/plone/volto/upgrades.zcml b/src/plone/volto/upgrades.zcml
@@ -51,4 +51,12 @@
         handler=".upgrades.remove_plone_richtext_behavior"
         />
   </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeDepends
+      title="Add blocks behavior to Event and News Item"
+      profile="plone.volto:default"
+      source="1015"
+      destination="1016"
+      import_steps="typeinfo"
+      />
 </configure>