Reuse manage_addTypeInformation in some places

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/portal_types@29268 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_type/SkinTemplateItem/portal_skins/erp5_type/ERP5Site_createModule.xml

@@ -62,12 +62,14 @@ portal_types = portal.portal_types\n
 object_portal_type_id = object_portal_type\n
 \n
 # Create a new portal_type for the module\n
-module_portal_type_value = portal_types.newContent(portal_type=\'Base Type\',\n
-  id=module_portal_type,\n
-  type_factory_method_id=\'addFolder\',\n
+portal_types.manage_addTypeInformation(\'ERP5 Type Information\',\n
+  id=module_portal_type, typeinfo_name=\'ERP5Type: Folder (ERP5 Folder)\')\n
+module_portal_type_value = portal_types[module_portal_type]\n
+# Set icon and allowed content types\n
+module_portal_type_value.edit(\n
   type_icon=\'folder_icon.gif\',\n
   type_filter_content_type=1,\n
-  type_allowed_content_type=object_portal_type_id,\n
+  type_allowed_content_type_list=(object_portal_type_id,),\n
   type_group=\'module\')\n
 # initialize translation domains\n
 module_portal_type_value.changeTranslations(\n
@@ -174,9 +176,11 @@ form.manage_addField(\n
 \n
 \n
 # Then add the portal_type corresponding to the new object\n
-object_portal_type_value = portal_types.newContent(portal_type=\'Base Type\',\n
-  id=object_portal_type_id,\n
-  type_factory_method_id=\'addXMLObject\')\n
+portal_types.manage_addTypeInformation(\'ERP5 Type Information\'\n
+                                      , typeinfo_name = \'ERP5Type: XML Object (ERP5 XML Object)\'\n
+                                      , id            = object_portal_type_id\n
+                                      )\n
+object_portal_type_value = portal_types[object_portal_type_id]\n
 \n
 # Chain to edit_workflow\n
 portal.portal_workflow.setChainForPortalTypes([object_portal_type_id],\n
@@ -269,12 +273,12 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
                             <string>portal</string>
                             <string>portal_types</string>
                             <string>object_portal_type_id</string>
+                            <string>_getitem_</string>
                             <string>module_portal_type_value</string>
                             <string>dict</string>
                             <string>module_list_form_id</string>
                             <string>portal_skins_folder_name</string>
                             <string>portal_skins</string>
-                            <string>_getitem_</string>
                             <string>skin_folder</string>
                             <string>_getiter_</string>
                             <string>skin_name</string>

product/ERP5/bootstrap/erp5_type/bt/revision

-66
\ No newline at end of file
+74
\ No newline at end of file

product/ERP5Type/ERP5Type.py

@@ -526,9 +526,10 @@ class ERP5TypeInformation(XMLObject,
     def addAction(self, id, name, action, condition, permission, category,
                   icon=None, visible=1, priority=1.0, REQUEST=None,
                   description=None):
-      # XXX Should be deprecated. newContent already does everything we want.
       if isinstance(permission, basestring):
         permission = permission,
+      if isinstance(action, str) and action[:7] not in ('string:', 'python:'):
+        value = 'string:${object_url}/' + value
       self.newContent(portal_type='Action Information',
                       reference=id,
                       title=name,

product/ERP5Type/Tool/TypesTool.py

@@ -116,7 +116,8 @@ class TypesTool(BaseTool, CMFCore_TypesTool.TypesTool):
       raise ValueError('An id is required.')
     type_info = self.newContent(id, 'Base Type')
     if fti:
-      type_info.__dict__.update(**fti)
+      type_info.__dict__.update((k, v) for k, v in fti.iteritems()
+        if k not in ('id', 'actions'))
 
 
 # Compatibility code to access old "ERP5 Role Information" objects.