[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - set add_view_expr explicitly

[Yvo Schubbe]

Log message for revision 93130:
  - set add_view_expr explicitly

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2008-11-19 11:57:38 UTC (rev 93130)
@@ -4,11 +4,14 @@
 2.2.0 (unreleased)
 ------------------
 
+- profiles: Added add view expressions to content type definitions.
+
 - skins/zpt_generic/permalink.py: fix typos, wrap object correctly.
   See: https://bugs.launchpad.net/bugs/299058 .
 
 - upgrade: Added basic upgrade steps.
-  So far they just allow to add and upgrade the root site manager.
+  So far they just allow to add and upgrade the root site manager and to set
+  add view expressions.
 
 - DiscussionTool: Make sure to only ask "real" content for their type
   information when checking whether discussions are allowed or not.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -8,7 +8,8 @@
  <property name="content_meta_type">CMF BTree Folder</property>
  <property name="product"></property>
  <property name="factory">cmf.folder.btree</property>
- <property name="add_view_expr"></property>
+ <property
+    name="add_view_expr">string:${folder_url}/++add++CMF%20BTree%20Folder</property>
  <property name="immediate_view">folder_edit_form</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">False</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -9,7 +9,8 @@
  <property name="content_meta_type">Document</property>
  <property name="product"></property>
  <property name="factory">cmf.document</property>
- <property name="add_view_expr"></property>
+ <property
+    name="add_view_expr">string:${folder_url}/++add++Document</property>
  <property name="immediate_view">metadata_edit_form</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -8,7 +8,8 @@
  <property name="content_meta_type">Favorite</property>
  <property name="product"></property>
  <property name="factory">cmf.favorite</property>
- <property name="add_view_expr"></property>
+ <property
+    name="add_view_expr">string:${folder_url}/++add++Favorite</property>
  <property name="immediate_view">metadata_edit_form</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -8,7 +8,7 @@
  <property name="content_meta_type">Portal File</property>
  <property name="product"></property>
  <property name="factory">cmf.file</property>
- <property name="add_view_expr"></property>
+ <property name="add_view_expr">string:${folder_url}/++add++File</property>
  <property name="immediate_view">metadata_edit_form</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -8,7 +8,7 @@
  <property name="content_meta_type">Portal Folder</property>
  <property name="product"></property>
  <property name="factory">cmf.folder</property>
- <property name="add_view_expr"></property>
+ <property name="add_view_expr">string:${folder_url}/++add++Folder</property>
  <property name="immediate_view">folder_edit_form</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">False</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -8,7 +8,7 @@
  <property name="content_meta_type">Portal Image</property>
  <property name="product"></property>
  <property name="factory">cmf.image</property>
- <property name="add_view_expr"></property>
+ <property name="add_view_expr">string:${folder_url}/++add++Image</property>
  <property name="immediate_view">metadata_edit_form</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -8,7 +8,7 @@
  <property name="content_meta_type">Link</property>
  <property name="product"></property>
  <property name="factory">cmf.link</property>
- <property name="add_view_expr"></property>
+ <property name="add_view_expr">string:${folder_url}/++add++Link</property>
  <property name="immediate_view">metadata_edit_form</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -9,7 +9,8 @@
  <property name="content_meta_type">News Item</property>
  <property name="product"></property>
  <property name="factory">cmf.newsitem</property>
- <property name="add_view_expr"></property>
+ <property
+    name="add_view_expr">string:${folder_url}/++add++News%20Item</property>
  <property name="immediate_view">metadata_edit_form</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2008-11-19 11:57:38 UTC (rev 93130)
@@ -14,7 +14,7 @@
   <genericsetup:upgradeStep
       source="2.1"
       destination="2.2"
-      title="Upgrade CMFDefault from 2.1 to 2.2 (only site object)"
+      title="Upgrade CMFDefault from 2.1 to 2.2 (only site object and add view expressions)"
       profile="Products.CMFDefault:default"
       handler=".to22.upgrade_default"
       />

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py	2008-11-19 11:50:35 UTC (rev 93129)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py	2008-11-19 11:57:38 UTC (rev 93130)
@@ -15,6 +15,7 @@
 $Id$
 """
 import logging
+from urllib import quote
 
 from Acquisition import aq_inner
 from Acquisition import aq_parent
@@ -25,9 +26,23 @@
     portal = aq_parent(aq_inner(tool))
     logger = logging.getLogger('GenericSetup.upgrade')
     upgrade_CMFSite_object(portal, logger)
+    upgrade_TypeInfos(portal, logger)
 
 def upgrade_CMFSite_object(portal, logger):
     components = portal.getSiteManager()
     if components.__name__ != '++etc++site':
         components.__name__ = '++etc++site'
         logger.info('Site manager name changed.')
+
+def upgrade_TypeInfos(portal, logger):
+    ttool = portal.portal_types
+    for ti in ttool.listTypeInfo():
+        if ti.getProperty('content_meta_type') == 'Discussion Item':
+            continue
+        if ti.getProperty('add_view_expr'):
+            continue
+        ti._updateProperty('add_view_expr',
+                           'string:${folder_url}/++add++%s'
+                           % quote(ti.getId()))
+        logger.info("TypeInfo '%s' changed." % ti.getId())
+