Remove the monkey patch while retaining the functionality (as we subclass it). Thanks Jerome.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19255 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/ERP5Type.py

@@ -147,6 +147,9 @@ class ERP5TypeInformation( FactoryTypeInformation,
     hidden_content_type_list = ()
     permission = ''
 
+    security.declareProtected(Permissions.ManagePortal, 'manage_main')
+    manage_main = FactoryTypeInformation.manage_propertiesForm
+
     # Groups are used to classify portal types (e.g. resource).
     # IMPLEMENTATION NOTE
     # The current implementation is practical but not modular at all

product/ERP5Type/ZopePatch.py

@@ -56,7 +56,6 @@ from Products.ERP5Type.patches import DateTimePatch
 from Products.ERP5Type.patches import PythonScript
 from Products.ERP5Type.patches import MailTemplates
 from Products.ERP5Type.patches import persistent_patch
-from Products.ERP5Type.patches import CMFCoreTypesTool
 
 # for python2.3 compatibility
 import threading

product/ERP5Type/patches/CMFCoreTypesTool.py

-from Products.CMFCore.TypesTool import TypeInformation
-from zLOG import LOG, INFO
-
-if getattr(TypeInformation, 'manage_main', None) is not None:
-  LOG('ERP5Type/patches/CMFCoreTypesTool.py', INFO, 'This patch is no longer needed. Skipping.')
-elif None in (getattr(TypeInformation, 'manage_propertiesForm__roles__', None),
-              getattr(TypeInformation, 'manage_propertiesForm', None)):
-  LOG('ERP5Type/patches/CMFCoreTypesTool.py', INFO, 'manage_propertiesForm not found. Skipping.')
-else:
-  TypeInformation.manage_main__roles__ = TypeInformation.manage_propertiesForm__roles__
-  TypeInformation.manage_main = TypeInformation.manage_propertiesForm
-