[Erp5-report] r32249 rafael - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 4 09:27:56 CET 2010
Author: rafael
Date: Thu Feb 4 09:27:56 2010
New Revision: 32249
URL: http://svn.erp5.org?rev=32249&view=rev
Log:
Reduce the duplicated code moving it to a third method.
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=32249&r1=32248&r2=32249&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Thu Feb 4 09:27:56 2010
@@ -4871,21 +4871,12 @@
revision_number = int(revision_number)+1
self.setRevision(revision_number)
- security.declareProtected(Permissions.ManagePortal, 'build')
- def build(self, no_action=0):
- """
- Copy existing portal objects to self
- """
- if no_action: return
- # this is use at import of Business Template to get the status built
- # Make sure that everything is sane.
- self.clean()
-
- self.updateRevisionNumber()
-
- self._setTemplateFormatVersion(1)
-
- # Store all data
+ security.declareProtected(Permissions.ManagePortal, 'storeTemplateItemData')
+ def storeTemplateItemData(self):
+ """
+ Instanciate and Store Template items into properties.
+ """
+ # Store all Data
self._portal_type_item = \
PortalTypeTemplateItem(self.getTemplatePortalTypeIdList())
self._portal_type_workflow_chain_item = \
@@ -4985,6 +4976,22 @@
CatalogLocalRoleKeyTemplateItem(
self.getTemplateCatalogLocalRoleKeyList())
+ security.declareProtected(Permissions.ManagePortal, 'build')
+ def build(self, no_action=0):
+ """
+ Copy existing portal objects to self
+ """
+ if no_action: return
+ # this is use at import of Business Template to get the status built
+ # Make sure that everything is sane.
+ self.clean()
+
+ self.updateRevisionNumber()
+
+ self._setTemplateFormatVersion(1)
+
+ self.storeTemplateItemData()
+
# Build each part
for item_name in self._item_name_list:
item = getattr(self, item_name)
@@ -5516,104 +5523,8 @@
bta = BusinessTemplateFolder(importing=1, file=file, path=root_path)
else:
bta = BusinessTemplateTarball(importing=1, file=file)
- self._portal_type_item = \
- PortalTypeTemplateItem(self.getTemplatePortalTypeIdList())
- self._portal_type_workflow_chain_item = \
- PortalTypeWorkflowChainTemplateItem(self.getTemplatePortalTypeWorkflowChainList())
- self._workflow_item = \
- WorkflowTemplateItem(self.getTemplateWorkflowIdList())
- self._skin_item = \
- SkinTemplateItem(self.getTemplateSkinIdList())
- self._registered_skin_selection_item = \
- RegisteredSkinSelectionTemplateItem(
- self.getTemplateRegisteredSkinSelectionList())
- self._category_item = \
- CategoryTemplateItem(self.getTemplateBaseCategoryList())
- self._catalog_method_item = \
- CatalogMethodTemplateItem(self.getTemplateCatalogMethodIdList())
- self._action_item = \
- ActionTemplateItem(self.getTemplateActionPathList())
- self._portal_type_roles_item = \
- PortalTypeRolesTemplateItem(self.getTemplatePortalTypeRoleList())
- self._site_property_item = \
- SitePropertyTemplateItem(self.getTemplateSitePropertyIdList())
- self._module_item = \
- ModuleTemplateItem(self.getTemplateModuleIdList())
- self._document_item = \
- DocumentTemplateItem(self.getTemplateDocumentIdList())
- self._property_sheet_item = \
- PropertySheetTemplateItem(self.getTemplatePropertySheetIdList())
- self._constraint_item = \
- ConstraintTemplateItem(self.getTemplateConstraintIdList())
- self._extension_item = \
- ExtensionTemplateItem(self.getTemplateExtensionIdList())
- self._test_item = \
- TestTemplateItem(self.getTemplateTestIdList())
- self._product_item = \
- ProductTemplateItem(self.getTemplateProductIdList())
- self._role_item = \
- RoleTemplateItem(self.getTemplateRoleList())
- self._catalog_result_key_item = \
- CatalogResultKeyTemplateItem(
- self.getTemplateCatalogResultKeyList())
- self._catalog_related_key_item = \
- CatalogRelatedKeyTemplateItem(
- self.getTemplateCatalogRelatedKeyList())
- self._catalog_result_table_item = \
- CatalogResultTableTemplateItem(
- self.getTemplateCatalogResultTableList())
- self._message_translation_item = \
- MessageTranslationTemplateItem(
- self.getTemplateMessageTranslationList())
- self._path_item = \
- PathTemplateItem(self.getTemplatePathList())
- self._preference_item = \
- PreferenceTemplateItem(self.getTemplatePreferenceList())
- self._portal_type_allowed_content_type_item = \
- PortalTypeAllowedContentTypeTemplateItem(
- self.getTemplatePortalTypeAllowedContentTypeList())
- self._portal_type_hidden_content_type_item = \
- PortalTypeHiddenContentTypeTemplateItem(
- self.getTemplatePortalTypeHiddenContentTypeList())
- self._portal_type_property_sheet_item = \
- PortalTypePropertySheetTemplateItem(
- self.getTemplatePortalTypePropertySheetList())
- self._portal_type_base_category_item = \
- PortalTypeBaseCategoryTemplateItem(
- self.getTemplatePortalTypeBaseCategoryList())
- self._catalog_keyword_key_item = \
- CatalogKeywordKeyTemplateItem(
- self.getTemplateCatalogKeywordKeyList())
- self._catalog_datetime_key_item = \
- CatalogDateTimeKeyTemplateItem(
- self.getTemplateCatalogDatetimeKeyList())
- self._catalog_full_text_key_item = \
- CatalogFullTextKeyTemplateItem(
- self.getTemplateCatalogFullTextKeyList())
- self._catalog_request_key_item = \
- CatalogRequestKeyTemplateItem(
- self.getTemplateCatalogRequestKeyList())
- self._catalog_multivalue_key_item = \
- CatalogMultivalueKeyTemplateItem(
- self.getTemplateCatalogMultivalueKeyList())
- self._catalog_topic_key_item = \
- CatalogTopicKeyTemplateItem(
- self.getTemplateCatalogTopicKeyList())
- self._local_roles_item = \
- LocalRolesTemplateItem(
- self.getTemplateLocalRoleList())
- self._tool_item = \
- ToolTemplateItem(
- self.getTemplateToolIdList())
- self._catalog_scriptable_key_item = \
- CatalogScriptableKeyTemplateItem(
- self.getTemplateCatalogScriptableKeyList())
- self._catalog_role_key_item = \
- CatalogRoleKeyTemplateItem(
- self.getTemplateCatalogRoleKeyList())
- self._catalog_local_role_key_item = \
- CatalogLocalRoleKeyTemplateItem(
- self.getTemplateCatalogLocalRoleKeyList())
+
+ self.storeTemplateItemData()
# Create temporary modules/classes for classes defined by this BT.
# This is required if the BT contains instances of one of these classes.
More information about the Erp5-report
mailing list