getInstanceBaseCategoryList seems a better name for getCategoryList.

renamed getPropertyAndCategoryList to getInstancePropertyAndBaseCategoryList as well



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

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml

@@ -76,7 +76,7 @@ for portal_type in module.allowedContentTypes():\n
   #for property in portal_type.getInstancePropertyMap():\n
     #property_string = "%s.%s" % (portal_type.id, property[\'id\'])\n
     #property_list.append(property_string)\n
-  for property in portal_type.getPropertyAndCategoryList():\n
+  for property in portal_type.getInstancePropertyAndBaseCategoryList():\n
     property_string = "%s.%s" % (portal_type.id, property)\n
     property_list.append(property_string)\n
 \n

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml

@@ -200,7 +200,7 @@ else:\n
             break\n
         if ptype_object is None:\n
           raise \'Portal type %s not found in allowed content types\' % portal_type\n
-        category_list = ptype_object.getCategoryList()\n
+        category_list = ptype_object.getInstanceBaseCategoryList()\n
         new_object = module.newContent( portal_type       = portal_type\n
                                       , immediate_reindex = 1\n
                                       )\n

product/ERP5Type/ERP5Type.py

@@ -248,11 +248,9 @@ class ERP5TypeInformation( FactoryTypeInformation,
         return self.defined_group_list
 
     security.declareProtected(Permissions.AccessContentsInformation,
-                              'getCategoryList')
-    def getCategoryList(self):
-      """
-       Return all the categories of the portal type
-      """
+                              'getInstanceBaseCategoryList')
+    def getInstanceBaseCategoryList(self):
+      """ Return all base categories of the portal type """
       current_list = []
       ptype_object = self
       # get the klass of the object based on the constructor document
@@ -286,12 +284,9 @@ class ERP5TypeInformation( FactoryTypeInformation,
       return current_list
 
     security.declareProtected(Permissions.AccessContentsInformation,
-                              'getPropertyAndCategoryList')
-    def getPropertyAndCategoryList(self):
-      """
-       Return all the properties and categories of
-       the portal type
-      """
+                              'getInstancePropertyAndBaseCategoryList')
+    def getInstancePropertyAndBaseCategoryList(self):
+      """Return all the properties and base categories of the portal type. """
       ptype_object = self
       # get the klass of the object based on the constructor document
       m = Products.ERP5Type._m