upgrade step

Conflicts:
	plone/app/contenttypes/upgrades.py
	plone/app/contenttypes/upgrades.zcml

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

@@ -1,5 +1,5 @@
 <metadata>
- <version>1103</version>
+ <version>1104</version>
  <dependencies>
   <dependency>profile-plone.app.dexterity:default</dependency>
   <dependency>profile-plone.app.event:default</dependency>

plone/app/contenttypes/upgrades.py

@@ -3,6 +3,8 @@
 # from plone.app.contenttypes.utils import DEFAULT_TYPES
 from plone.dexterity.interfaces import IDexterityFTI
 from zope.component import queryUtility
+import logging
+logger = logging.getLogger(name="plone.app.contenttypes upgrade")
 
 
 def update_fti(context):
@@ -121,3 +123,44 @@ def migrate_album_view(context):
 #         behaviors.append(behavior)
 #         behaviors = tuple(behaviors)
 #         fti._updateProperty('behaviors', behaviors)
+
+
+def use_new_view_names(context):
+    """Migrate old view names to new view names."""
+
+    # TODO: Don't reload the profile. Only change the settings.
+    context.runImportStepFromProfile(
+        'profile-plone.app.contenttypes:default',
+        'typeinfo',
+    )
+    catalog = getToolByName(context, 'portal_catalog')
+    search = catalog.unrestrictedSearchResults
+
+    def _fixup(portal_type, view_map):
+        for brain in search(portal_type=portal_type):
+            obj = brain.getObject()
+            current = context.getLayout()
+            if current in view_map.keys():
+                obj.setLayout(view_map[current])
+                logger.info("Set view to {} for {}".format(
+                    view_map[current], obj.absolute_url()
+                ))
+
+    folder_view_map = {  # OLD : NEW
+        'folder_listing': 'listing_view',
+        'folder_full_view': 'full_view',
+        'folder_summary_view': 'summary_view',
+        'folder_tabular_view': 'tabular_view',
+        'folder_album_view': 'album_view',
+        'atct_album_view': 'album_view',
+    }
+    collection_view_map = {  # OLD : NEW
+        'view': 'listing_view',
+        'standard_view': 'listing_view',
+        'collection_view': 'listing_view',
+        'all_content': 'full_view',
+        'thumbnail_view': 'album_view',
+    }
+    _fixup('Folder', folder_view_map)
+    _fixup('Plone Site', folder_view_map)
+    _fixup('Collection', collection_view_map)

plone/app/contenttypes/upgrades.zcml

@@ -62,4 +62,14 @@
       handler=".upgrades.enable_shortname_behavior"
       />
  -->
+
+  <genericsetup:upgradeStep
+      source="1103"
+      destination="1104"
+      title="Use new view names"
+      description=""
+      profile="plone.app.contenttypes:default"
+      handler=".upgrades.use_new_view_names"
+      />
+
 </configure>