Merge and register hotfix

lib/python/App/Hotfixes.py

@@ -16,6 +16,8 @@ from zLOG import LOG, INFO, WARNING
 
 merged_hotfixes = {
     'Hotfix_2001-09-28': 1,
+    'Hotfix_2002-03-01': 1,
+    'Hotfix_2002-06-14': 1,
     }
 
 

lib/python/Products/ZCatalog/ZCatalogIndexes.py

@@ -11,7 +11,8 @@
 # 
 ##############################################################################
 
-from  Globals import DTMLFile
+from  Globals import DTMLFile, InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
 import Globals
 from OFS.Folder import Folder
 from OFS.FindSupport import FindSupport
@@ -44,6 +45,9 @@ class ZCatalogIndexes (IFAwareObjectManager, Folder, Persistent, Implicit):
         Historical.manage_options +
         SimpleItem.manage_options
     )
+    
+    security = ClassSecurityInfo()
+    security.declareObjectProtected('Manage ZCatalogIndex Entries')
 
     manage_main = DTMLFile('dtml/manageIndex',globals())
     addIndexForm= DTMLFile('dtml/addIndexForm',globals())
@@ -61,7 +65,9 @@ class ZCatalogIndexes (IFAwareObjectManager, Folder, Persistent, Implicit):
              'valid_roles', 'getobject'],
 
             ['Anonymous', 'Manager']
-        )
+        ),
+        
+        ('Manage ZCatalogIndex Entries', ('',)),
     )
 
 
@@ -123,6 +129,8 @@ class ZCatalogIndexes (IFAwareObjectManager, Folder, Persistent, Implicit):
 
         return getattr(self, name)
 
+InitializeClass(ZCatalogIndexes)
+
 class OldCatalogWrapperObject(SimpleItem, Implicit):
 
     manage_options= (