[Erp5-report] r9201 - in /erp5/trunk: bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Aug 14 17:38:26 CEST 2006
Author: jerome
Date: Mon Aug 14 17:38:19 2006
New Revision: 9201
URL: http://svn.erp5.org?rev=9201&view=rev
Log:
getInstanceBaseCategoryList seems a better name for getCategoryList.
renamed getPropertyAndCategoryList to getInstancePropertyAndBaseCategoryList as well
Modified:
erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml
erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
erp5/trunk/products/ERP5Type/ERP5Type.py
Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml?rev=9201&r1=9200&r2=9201&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml Mon Aug 14 17:38:19 2006
@@ -76,7 +76,7 @@
#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
Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml?rev=9201&r1=9200&r2=9201&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml Mon Aug 14 17:38:19 2006
@@ -200,7 +200,7 @@
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
Modified: erp5/trunk/products/ERP5Type/ERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ERP5Type.py?rev=9201&r1=9200&r2=9201&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ERP5Type.py (original)
+++ erp5/trunk/products/ERP5Type/ERP5Type.py Mon Aug 14 17:38:19 2006
@@ -248,11 +248,9 @@
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 @@
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
More information about the Erp5-report
mailing list