[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.64

[Sidnei da Silva]

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv11995/Extensions

Modified Files:
	setupZopeOrg.py 
Log Message:
Ooops. I broke ZSP & Case Studies when added new workflow. Also, a few fixes to allowed_content_types and a bug were objects already created werent getting the right workflow permissions

=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.63 => 1.64 ===
     log.append('\n * Creating a Members BTreeFolder')
     
     if ( 'Members' in portal.objectIds() and 
-         getattr( portal, 'Members' ).meta_type in ( 'Folder', 'Portal Folder' ) ):
+         getattr( portal, 'Members' ).meta_type in ( 'Folder',
+                                                     'Portal Folder',
+                                                     'Plone Folder') ):
         portal._delObject( 'Members' )
         manage_addCMFBTreeFolder( portal, 'Members', 'Member Folder' )
 
@@ -296,10 +298,9 @@
         log_list[1] = '  - %s' % log_list[i]
     log.extend(log_list)
 
-    log.append('\n * Modifying allowed/filtered types for folderish types')
-    folderish_types=['Wiki Folder', 'Software Package',
-                     'Software Release', 'Member Folder']
-    setupAllowedTypes(portal, folderish_types)
+    #log.append('\n * Modifying allowed/filtered types for folderish types')
+    #folderish_types=[]
+    #setupAllowedTypes(portal, folderish_types)
 
     # Prune the addable types visible in CMF Folders
     log.append( '\n * Pruning addable types in folder add list' )
@@ -428,6 +429,7 @@
                                       )
         log.append('   - Inserted workflow "%s" for type "%s"' % (wf_id, 
                                                                   wf_portaltype))
+    wf_tool.updateRoleMappings()
 
 
 def setupRolesAndPermissions(portal_obj):