Commit da9048db authored by Kevin Deldycke's avatar Kevin Deldycke

getPortalAssignmentBaseCategoryList must return a list, not a tuple


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4284 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7d6327d6
...@@ -312,7 +312,7 @@ class ERP5Site ( CMFSite, FolderMixIn ): ...@@ -312,7 +312,7 @@ class ERP5Site ( CMFSite, FolderMixIn ):
""" """
return self._getPortalConfiguration('portal_delivery_type_list') return self._getPortalConfiguration('portal_delivery_type_list')
security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
'getPortalTransformationTypeList') 'getPortalTransformationTypeList')
def getPortalTransformationTypeList(self): def getPortalTransformationTypeList(self):
""" """
...@@ -509,29 +509,33 @@ class ERP5Site ( CMFSite, FolderMixIn ): ...@@ -509,29 +509,33 @@ class ERP5Site ( CMFSite, FolderMixIn ):
Return tab base categories. Return tab base categories.
""" """
return self._getPortalConfiguration('portal_tab_base_category_list') return self._getPortalConfiguration('portal_tab_base_category_list')
def getPortalDefaultGapRoot(self): def getPortalDefaultGapRoot(self):
""" """
Return the Accounting Plan to use by default (return the root node) Return the Accounting Plan to use by default (return the root node)
""" """
return self._getPortalConfiguration('portal_default_gap_root') return self._getPortalConfiguration('portal_default_gap_root')
def getPortalDefaultAccountingMovementTypeList(self) : def getPortalDefaultAccountingMovementTypeList(self) :
""" """
Return accounting movement type list. Return accounting movement type list.
""" """
return self._getPortalConfiguration('portal_accounting_movement_type_list') return self._getPortalConfiguration('portal_accounting_movement_type_list')
def getPortalAssignmentBaseCategoryList(self): def getPortalAssignmentBaseCategoryList(self):
""" """
Return List of category values to generate security groups. Return List of category values to generate security groups.
""" """
return self._getPortalConfiguration('portal_assignment_base_category_list') category_tuple = self._getPortalConfiguration('portal_assignment_base_category_list')
category_list = []
if category_tuple not in (None, '', (), []):
category_list = [ x for x in category_tuple]
return category_list
security.declareProtected(Permissions.AccessContentsInformation, 'getDefaultModuleId') security.declareProtected(Permissions.AccessContentsInformation, 'getDefaultModuleId')
def getDefaultModuleId(self, portal_type): def getDefaultModuleId(self, portal_type):
""" """
Return default module id where a object with portal_type can Return default module id where a object with portal_type can
be created. be created.
""" """
# Very dummy method, but it works with today name convention. # Very dummy method, but it works with today name convention.
...@@ -633,7 +637,7 @@ class ERP5Generator(PortalGenerator): ...@@ -633,7 +637,7 @@ class ERP5Generator(PortalGenerator):
# because the API is not the completely same as ERP5Catalog, and ZCatalog is # because the API is not the completely same as ERP5Catalog, and ZCatalog is
# useless for ERP5 after all. # useless for ERP5 after all.
p._delObject('portal_catalog') p._delObject('portal_catalog')
# Add CMF Report Tool # Add CMF Report Tool
addTool = p.manage_addProduct['CMFReportTool'].manage_addTool addTool = p.manage_addProduct['CMFReportTool'].manage_addTool
addTool('CMF Report Tool', None) addTool('CMF Report Tool', None)
...@@ -682,7 +686,7 @@ class ERP5Generator(PortalGenerator): ...@@ -682,7 +686,7 @@ class ERP5Generator(PortalGenerator):
addTool = p.manage_addProduct['ERP5Form'].manage_addTool addTool = p.manage_addProduct['ERP5Form'].manage_addTool
addTool('ERP5 Selections', None) addTool('ERP5 Selections', None)
addTool('ERP5 Preference Tool', None) addTool('ERP5 Preference Tool', None)
# Add ERP5SyncML Tools # Add ERP5SyncML Tools
addTool = p.manage_addProduct['ERP5SyncML'].manage_addTool addTool = p.manage_addProduct['ERP5SyncML'].manage_addTool
addTool('ERP5 Synchronizations', None) addTool('ERP5 Synchronizations', None)
...@@ -779,7 +783,7 @@ class ERP5Generator(PortalGenerator): ...@@ -779,7 +783,7 @@ class ERP5Generator(PortalGenerator):
addDirectoryViews(ps, 'skins', cmfactivity_globals) addDirectoryViews(ps, 'skins', cmfactivity_globals)
ps.manage_addProduct['OFSP'].manage_addFolder(id='external_method') ps.manage_addProduct['OFSP'].manage_addFolder(id='external_method')
ps.manage_addProduct['OFSP'].manage_addFolder(id='custom') ps.manage_addProduct['OFSP'].manage_addFolder(id='custom')
# set the 'custom' layer a high priority, so it remains the first # set the 'custom' layer a high priority, so it remains the first
# layer when installing new business templates # layer when installing new business templates
ps['custom'].manage_addProperty( ps['custom'].manage_addProperty(
"business_template_skin_layer_priority", 100.0, "float") "business_template_skin_layer_priority", 100.0, "float")
...@@ -864,7 +868,7 @@ class ERP5Generator(PortalGenerator): ...@@ -864,7 +868,7 @@ class ERP5Generator(PortalGenerator):
p.acl_users.manage_addProduct['ERP5Security'].addERP5GroupManager('erp5_groups') p.acl_users.manage_addProduct['ERP5Security'].addERP5GroupManager('erp5_groups')
p.acl_users.manage_addProduct['ERP5Security'].addERP5RoleManager('erp5_roles') p.acl_users.manage_addProduct['ERP5Security'].addERP5RoleManager('erp5_roles')
# Register ERP5UserManager Interface # Register ERP5UserManager Interface
p.acl_users.erp5_users.manage_activateInterfaces(('IAuthenticationPlugin', p.acl_users.erp5_users.manage_activateInterfaces(('IAuthenticationPlugin',
'IUserEnumerationPlugin',)) 'IUserEnumerationPlugin',))
p.acl_users.erp5_groups.manage_activateInterfaces(('IGroupsPlugin',)) p.acl_users.erp5_groups.manage_activateInterfaces(('IGroupsPlugin',))
p.acl_users.erp5_roles.manage_activateInterfaces(('IRolesPlugin',)) p.acl_users.erp5_roles.manage_activateInterfaces(('IRolesPlugin',))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment