[Erp5-report] r27091 - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: jp
Date: Thu May 21 17:56:18 2009
New Revision: 27091

URL: http://svn.erp5.org?rev=27091&view=rev
Log:
Use accessors to access properties. Renamed properties without plurals.

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=27091&r1=27090&r2=27091&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Thu May 21 17:56:18 2009
@@ -52,6 +52,7 @@
 from Products.ERP5Type.Utils import readLocalTest, \
                                     writeLocalTest, \
                                     removeLocalTest
+from Products.ERP5Type.Utils import convertToUpperCase
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.RoleInformation import RoleInformation
@@ -4538,7 +4539,7 @@
       self._action_item = \
           ActionTemplateItem(self.getTemplateActionPathList())
       self._portal_type_roles_item = \
-          PortalTypeRolesTemplateItem(self.getTemplatePortalTypeRolesList())
+          PortalTypeRolesTemplateItem(self.getTemplatePortalTypeRoleList())
       self._site_property_item = \
           SitePropertyTemplateItem(self.getTemplateSitePropertyIdList())
       self._module_item = \
@@ -4605,7 +4606,7 @@
                self.getTemplateCatalogTopicKeyList())
       self._local_roles_item = \
           LocalRolesTemplateItem(
-               self.getTemplateLocalRolesList())
+               self.getTemplateLocalRoleList())
       self._tool_item = \
           ToolTemplateItem(
                self.getTemplateToolIdList())
@@ -4965,7 +4966,8 @@
         We have to set this method because we want an
         ordered list
       """
-      result = getattr(self, id, ())
+      method_id = '_baseGet%sList' % convertToUpperCase(id)
+      result = getattr(self, method_id)(())
       if result is None: result = ()
       if result != ():
         result = list(result)
@@ -5058,19 +5060,19 @@
       """
       return self._getOrderedList('template_action_path')
 
-    def getTemplatePortalTypeRolesList(self):
+    def getTemplatePortalTypeRoleList(self):
       """
       We have to set this method because we want an
       ordered list
       """
-      return self._getOrderedList('template_portal_type_roles')
-
-    def getTemplateLocalRolesList(self):
+      return self._getOrderedList('template_portal_type_role')
+
+    def getTemplateLocalRoleList(self):
       """
       We have to set this method because we want an
       ordered list
       """
-      return self._getOrderedList('template_local_roles')
+      return self._getOrderedList('template_local_role')
 
     def getTemplateSkinIdList(self):
       """
@@ -5228,7 +5230,7 @@
                self.getTemplateCatalogTopicKeyList())
       self._local_roles_item = \
           LocalRolesTemplateItem(
-               self.getTemplateLocalRolesList())
+               self.getTemplateLocalRoleList())
       self._tool_item = \
           ToolTemplateItem(
                self.getTemplateToolIdList())