Commit 6261b64d authored by Jérome Perrin's avatar Jérome Perrin

Display more information in the error message generated when the Allowed

Content Type, Hidden Content Type or Base Category is not present in the
configuration we are exporting.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14744 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7897fa16
...@@ -1508,7 +1508,9 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem): ...@@ -1508,7 +1508,9 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem):
PortalTypeTemplateWorkflowChainItem = PortalTypeWorkflowChainTemplateItem PortalTypeTemplateWorkflowChainItem = PortalTypeWorkflowChainTemplateItem
class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem): class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem):
# XXX This class is subclassed for hidden types, propertysheets, base
# categories ...
name = 'Allowed Content Type'
xml_tag = 'allowed_content_type_list' xml_tag = 'allowed_content_type_list'
class_property = 'allowed_content_types' class_property = 'allowed_content_types'
...@@ -1523,7 +1525,10 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem): ...@@ -1523,7 +1525,10 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem):
ob = types_tool._getOb(portal_type) ob = types_tool._getOb(portal_type)
prop_value = getattr(ob, self.class_property, ()) prop_value = getattr(ob, self.class_property, ())
if not allowed_type in prop_value: if not allowed_type in prop_value:
raise ValueError, "Property %s not found in portal type %s" %(allowed_type, portal_type) raise ValueError, "%s %s not found in portal type %s" % (
getattr(self, 'name', self.__class__.__name__),
allowed_type, portal_type)
if self._objects.has_key(portal_type): if self._objects.has_key(portal_type):
allowed_list = self._objects[portal_type] allowed_list = self._objects[portal_type]
allowed_list.append(allowed_type) allowed_list.append(allowed_type)
...@@ -1646,21 +1651,28 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem): ...@@ -1646,21 +1651,28 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem):
original_property_list.remove(id) original_property_list.remove(id)
setattr(portal_type, self.class_property, list(original_property_list)) setattr(portal_type, self.class_property, list(original_property_list))
class PortalTypeHiddenContentTypeTemplateItem(PortalTypeAllowedContentTypeTemplateItem): class PortalTypeHiddenContentTypeTemplateItem(PortalTypeAllowedContentTypeTemplateItem):
name = 'Hidden Content Type'
xml_tag = 'hidden_content_type_list' xml_tag = 'hidden_content_type_list'
class_property = 'hidden_content_type_list' class_property = 'hidden_content_type_list'
class PortalTypePropertySheetTemplateItem(PortalTypeAllowedContentTypeTemplateItem): class PortalTypePropertySheetTemplateItem(PortalTypeAllowedContentTypeTemplateItem):
name = 'Property Sheet'
xml_tag = 'property_sheet_list' xml_tag = 'property_sheet_list'
class_property = 'property_sheet_list' class_property = 'property_sheet_list'
class PortalTypeBaseCategoryTemplateItem(PortalTypeAllowedContentTypeTemplateItem): class PortalTypeBaseCategoryTemplateItem(PortalTypeAllowedContentTypeTemplateItem):
name = 'Base Category'
xml_tag = 'base_category_list' xml_tag = 'base_category_list'
class_property = 'base_category_list' class_property = 'base_category_list'
class CatalogMethodTemplateItem(ObjectTemplateItem): class CatalogMethodTemplateItem(ObjectTemplateItem):
"""Template Item for catalog methods. """Template Item for catalog methods.
......
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