erp5_catalog: Set declarative securities and solve some inheritance conflicts

product/ERP5Catalog/ERP5Catalog.py

@@ -55,7 +55,20 @@ class ERP5Catalog(Folder, Catalog):
   allowed_types = ()
   #TODO(low priority): Add an icon to display at ERP5 Zope interface
   icon = None
+
+  # Declarative security
   security = ClassSecurityInfo()
+  security.declareObjectProtected(Permissions.AccessContentsInformation)
+  security.declareProtected(Permissions.ManagePortal,
+                              'manage_editProperties',
+                              'manage_changeProperties',
+                              'manage_propertiesForm',
+                                )
+
+  #_properties = Catalog._properties
+  #_propertyMap = Catalog._propertyMap
+  #_setPropValue = Catalog._setPropValue
+  #getProperty = Catalog.getProperty
 
   manage_options = ( Folder.manage_options+
                      OFS.History.Historical.manage_options
@@ -65,14 +78,10 @@ class ERP5Catalog(Folder, Catalog):
   property_sheets = ( PropertySheet.Base
                     , PropertySheet.SimpleItem
                     , PropertySheet.Folder
+                    , PropertySheet.CategoryCore
                     , PropertySheet.Catalog
                     )
 
-  _properties = Catalog._properties
-  _propertyMap = Catalog._propertyMap
-  _setPropValue = Catalog._setPropValue
-  getProperty = Catalog.getProperty
-
   # Declarative Constructors
   constructors = (manage_addERP5CatalogForm, manage_addERP5Catalog,)
 
@@ -93,6 +102,9 @@ class ERP5Catalog(Folder, Catalog):
         meta_types.append(meta_type)
     return meta_types
 
+  _updateProperty = Catalog._updateProperty
+  _setPropValue = Catalog._setPropValue
+
 InitializeClass(ERP5Catalog)
 
 class ERP5CatalogError(CatalogError): pass