Commit 91b4a4df authored by Sebastien Robin's avatar Sebastien Robin

renamed portal_mapped_value_property_list to portal_criterion_property_list


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3202 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bde275fb
...@@ -268,7 +268,7 @@ class PredicateGroup(Folder, Predicate): ...@@ -268,7 +268,7 @@ class PredicateGroup(Folder, Predicate):
identity_criterion = getattr(self,'_identity_criterion',{}) identity_criterion = getattr(self,'_identity_criterion',{})
range_criterion = getattr(self,'_range_criterion',{}) range_criterion = getattr(self,'_range_criterion',{})
# Look at local properties and make it criterion properties # Look at local properties and make it criterion properties
for property in self.getPortalMappedValuePropertyList(): for property in self.getPortalCriterionPropertyList():
if property not in self.getCriterionPropertyList() \ if property not in self.getCriterionPropertyList() \
and property in self.propertyIds(): and property in self.propertyIds():
criterion_property_list.append(property) criterion_property_list.append(property)
......
...@@ -156,4 +156,4 @@ portal_tab_base_category_list = ('morphologie', ) ...@@ -156,4 +156,4 @@ portal_tab_base_category_list = ('morphologie', )
portal_criterion_base_category_list = ('source','destination','resource', portal_criterion_base_category_list = ('source','destination','resource',
'destination_section','source_section','group') 'destination_section','source_section','group')
portal_mapped_value_property_list = ('start_date','stop_date') portal_criterion_property_list = ('start_date','stop_date')
...@@ -382,12 +382,12 @@ class ERP5Site ( CMFSite, FolderMixIn ): ...@@ -382,12 +382,12 @@ class ERP5Site ( CMFSite, FolderMixIn ):
""" """
return self._getPortalConfiguration('portal_criterion_base_category_list') return self._getPortalConfiguration('portal_criterion_base_category_list')
security.declareProtected(Permissions.AccessContentsInformation, 'getPortalMappedValuePropertyList') security.declareProtected(Permissions.AccessContentsInformation, 'getPortalCriterionPropertyList')
def getPortalMappedValuePropertyList(self): def getPortalCriterionPropertyList(self):
""" """
Return container types. Return container types.
""" """
return self._getPortalConfiguration('portal_mapped_value_property_list') return self._getPortalConfiguration('portal_criterion_property_list')
security.declareProtected(Permissions.AccessContentsInformation, 'getPortalContainerLineTypeList') security.declareProtected(Permissions.AccessContentsInformation, 'getPortalContainerLineTypeList')
def getPortalContainerLineTypeList(self): def getPortalContainerLineTypeList(self):
......
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