Skip to content

erp5_fork
erp5_fork
Commit b7580a4c authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Merged all existing configuration workflow into erp5_configurator_standard 

This changes aims for reduce the maintanence burn of keep several workflows and
drop code duplication existant on varius workflows.
This change also simplifies the setup, only requiring install a single bt5 to have all workflows (instead 4 or 5).
parent 355cc80e
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 487 deletions
bt5/erp5_configurator_maxma_demo/bt/change_log deleted 100644 → 0
View file @ 355cc80e
2011-04-12 lucas
* Added a default_image on the business configuration.
2010-03-28 rafael
* Initial Release
\ No newline at end of file
bt5/erp5_configurator_maxma_demo/bt/copyright_list deleted 100644 → 0
View file @ 355cc80e
Copyright (c) 2010 Nexedi SA
\ No newline at end of file
bt5/erp5_configurator_maxma_demo/bt/dependency_list deleted 100644 → 0
View file @ 355cc80e
erp5_configurator
\ No newline at end of file
bt5/erp5_configurator_maxma_demo/bt/description deleted 100644 → 0
View file @ 355cc80e
This configurator workflows install all needed business templates to generate a demo with erp5_maxma_demo_sample.
\ No newline at end of file
bt5/erp5_configurator_maxma_demo/bt/template_path_list deleted 100644 → 0
View file @ 355cc80e
business_configuration_module/default_maxma_demo_configuration
workflow_module/maxma_demo_configuration_workflow
workflow_module/maxma_demo_configuration_workflow/**
\ No newline at end of file
bt5/erp5_configurator_maxma_demo/bt/template_skin_id_list deleted 100644 → 0
View file @ 355cc80e
erp5_configurator_maxma_demo
\ No newline at end of file
bt5/erp5_configurator_maxma_demo/bt/template_test_id_list deleted 100644 → 0
View file @ 355cc80e
testMaxmaDemoConfigurationWorkflow
\ No newline at end of file
bt5/erp5_configurator_maxma_demo/bt/title deleted 100644 → 0
View file @ 355cc80e
erp5_configurator_maxma_demo
\ No newline at end of file
bt5/erp5_configurator_run_my_doc/bt/change_log deleted 100644 → 0
View file @ 355cc80e
2011-11-14 Xavier
* Initial commit.
\ No newline at end of file
bt5/erp5_configurator_run_my_doc/bt/copyright_list deleted 100644 → 0
View file @ 355cc80e
Copyright (c) 2011 Nexedi SA
\ No newline at end of file
bt5/erp5_configurator_run_my_doc/bt/dependency_list deleted 100644 → 0
View file @ 355cc80e
erp5_configurator
\ No newline at end of file
bt5/erp5_configurator_run_my_doc/bt/template_path_list deleted 100644 → 0
View file @ 355cc80e
business_configuration_module/run_my_doc_configuration
workflow_module/run_my_doc_configuration_workflow
workflow_module/run_my_doc_configuration_workflow/**
\ No newline at end of file
bt5/erp5_configurator_run_my_doc/bt/template_skin_id_list deleted 100644 → 0
View file @ 355cc80e
erp5_configurator_run_my_doc
\ No newline at end of file
bt5/erp5_configurator_run_my_doc/bt/template_test_id_list deleted 100644 → 0
View file @ 355cc80e
testRunMyDocConfigurationWorkflow
\ No newline at end of file
bt5/erp5_configurator_run_my_doc/bt/title deleted 100644 → 0
View file @ 355cc80e
erp5_configurator_run_my_doc
\ No newline at end of file
bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/account_type.xml
View file @ b7580a4c
......@@ -146,10 +146,6 @@ You can still safely change Title or (better) translate it using Localizer</stri
<key> <string>id_group</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
......
bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/configurator_function.xml deleted 100644 → 0
View file @ 355cc80e
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Category" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_folder_handler</string> </key>
<value> <string>CMFBTreeFolderHandler</string> </value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>configurator_function</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Configurator Function</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/configurator_region.xml deleted 100644 → 0
View file @ 355cc80e
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Category" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_folder_handler</string> </key>
<value> <string>CMFBTreeFolderHandler</string> </value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>subordination</string>
</tuple>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple>
<string>default_address</string>
</tuple>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: [\'Address\', \'Organisation\', \'Person\']</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>configurator_region</string>
</tuple>
</value>
</item>
<item>
<key> <string>category_type</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>configurator_region</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>multimembership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>read_permission</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>rid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Region</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/financial_section.xml
View file @ b7580a4c
......@@ -145,10 +145,6 @@
<key> <string>id_group</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
......
bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/gap.xml
View file @ b7580a4c
......@@ -147,10 +147,6 @@
<key> <string>id_group</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
......
bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_consulting_standard_configuration.xml
View file @ b7580a4c
......@@ -162,10 +162,6 @@
<none/>
</value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>2</string> </value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value>
......
bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_standard_configuration.xml
View file @ b7580a4c
......@@ -184,10 +184,6 @@
<none/>
</value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>3</string> </value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value>
......
bt5/erp5_configurator_maxma_demo/TestTemplateItem/testMaxmaDemoConfigurationWorkflow.py → bt5/erp5_configurator_standard/TestTemplateItem/testMaxmaDemoConfigurationWorkflow.py
View file @ b7580a4c
......@@ -67,14 +67,6 @@ class TestMaxmaDemoConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin):
'erp5_l10n_pt-BR',
'erp5_demo_maxma_rule')
def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy',
'erp5_full_text_myisam_catalog',
'erp5_base',
'erp5_workflow',
'erp5_configurator',
'erp5_configurator_maxma_demo',)
def stepCreateBusinessConfiguration(self, sequence=None,\
sequence_list=None, **kw):
""" Create one Business Configuration """
......@@ -140,7 +132,7 @@ class TestMaxmaDemoConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin):
# Check Gadgets
for gadget in self.portal.portal_gadgets.searchFolder():
self.assertEquals('public', gadget.getValidationState(),
"%s is not public but %s" % (gadget.getRelativeUrl(),
"%s is not public but %s" % (gadget.getRelativeUrl(),
gadget.getValidationState()))
gadget.Base_checkConsistency()
......@@ -151,7 +143,7 @@ class TestMaxmaDemoConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin):
self.assertNotEquals(user.Person_getAvailableAssignmentValueList(), [])
self.assertEquals(user.getTitle(), "Jack Vale")
self.assertEquals(user.getValidationState(), "validated")
self.assertEquals(user.getSubordination(),
self.assertEquals(user.getSubordination(),
'organisation_module/myorganisation')
self.assertEquals(user.getSubordinationTitle(), "Maxma Co")
......
bt5/erp5_configurator_run_my_doc/TestTemplateItem/testRunMyDocConfigurationWorkflow.py → bt5/erp5_configurator_standard/TestTemplateItem/testRunMyDocConfigurationWorkflow.py
View file @ b7580a4c
......@@ -83,15 +83,6 @@ class TestRunMyDocsConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
stepCheckKnowledgePadRole
"""
def getBusinessTemplateList(self):
return ('erp5_promise',
'erp5_core_proxy_field_legacy',
'erp5_full_text_myisam_catalog',
'erp5_base',
'erp5_workflow',
'erp5_configurator',
'erp5_configurator_run_my_doc',)
def stepCreateBusinessConfiguration(self, sequence=None, sequence_list=None, **kw):
""" Create one Business Configuration """
module = self.portal.business_configuration_module
......@@ -209,7 +200,7 @@ class TestRunMyDocsConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
self.portal.ERP5Site_createDefaultKnowledgePadListForUser()
self.tic()
current_user = self.portal.portal_membership.getAuthenticatedMember().getUserName()
pad = self.portal.portal_catalog.getResultValue(portal_type="Knowledge Pad",
pad = self.portal.portal_catalog.getResultValue(portal_type="Knowledge Pad",
owner=current_user)
gadget_uid = self.portal.portal_gadgets.test_wizard_gadget.getUid()
self.portal.KnowledgePad_addBoxList(uids=[gadget_uid],
......
bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py → bt5/erp5_configurator_standard/TestTemplateItem/testUNGConfigurationWorkflow.py
View file @ b7580a4c
......@@ -103,15 +103,6 @@ class TestUNGConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
stepCheckCreateNewEvent
"""
def getBusinessTemplateList(self):
return ('erp5_promise',
'erp5_core_proxy_field_legacy',
'erp5_full_text_myisam_catalog',
'erp5_base',
'erp5_workflow',
'erp5_configurator',
'erp5_configurator_ung',)
def stepCreateBusinessConfiguration(self, sequence=None, sequence_list=None, **kw):
""" Create one Business Configuration """
module = self.portal.business_configuration_module
......@@ -231,7 +222,7 @@ class TestUNGConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
self.assertEquals(preference.getPreferenceState(), "enabled")
preference = self.portal.portal_preferences.ung_preference
self.assertEquals(preference.getPreferenceState(), "global")
def _stepCheckWebSiteRoles(self):
""" Check permission of Web Site with normal user """
self.changeSkin("UNGDoc")
......@@ -306,7 +297,7 @@ class TestUNGConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
start_date = event.getStartDate()
self.assertEquals(start_date.month(), 2)
self.assertEquals(start_date.minute(), 12)
class TestUNGConfiguratorWorkflowFranceLanguage(TestUNGConfiguratorWorkflowMixin):
"""
......
bt5/erp5_configurator_standard/bt/change_log
View file @ b7580a4c
2012-10-22 Rafael
* Merged maxma_demo, run_my_docs and ung into workflow standard.
2011-11-14 Xavier
* Initial commit of run_my_docs workflow
2011-08-04 Gabriel L. Oliveira
* Fix proxy of transition's scripts
2011-04-12 lucas
* Added default image on default_standard_configuration and a better description.
......@@ -47,6 +56,18 @@
2011-03-30 lucas
* Updated default_accounts_express.ods with Russian accounts information. (Thanks to Vera Kurpas.)
2011-03-29 Gabriel
* Add unit test to UNG Configurator
2010-03-28 rafael
* Initial Release of Maxma Demo
2011-03-28 Gabriel
* Add script to configure UNG Web Site
2011-03-24 Gabriel
* Initial commit of ung workflow
2010-01-07 lucas
* Merged with consulting workflow.
......
bt5/erp5_configurator_standard/bt/template_path_list
View file @ b7580a4c
business_configuration_module/default_consulting_standard_configuration
business_configuration_module/default_maxma_demo_configuration
business_configuration_module/default_standard_configuration
business_configuration_module/run_my_doc_configuration
business_configuration_module/ung_configuration
workflow_module/erp5_consulting_workflow
workflow_module/erp5_consulting_workflow/**
workflow_module/erp5_standard_workflow
workflow_module/erp5_standard_workflow/**
\ No newline at end of file
workflow_module/erp5_standard_workflow/**
workflow_module/maxma_demo_configuration_workflow
workflow_module/maxma_demo_configuration_workflow/**
workflow_module/run_my_doc_configuration_workflow
workflow_module/run_my_doc_configuration_workflow/**
workflow_module/ung_configuration_workflow
workflow_module/ung_configuration_workflow/**
\ No newline at end of file
bt5/erp5_configurator_standard/bt/template_skin_id_list
View file @ b7580a4c
erp5_configurator_consulting
erp5_configurator_standard
\ No newline at end of file
erp5_configurator_maxma_demo
erp5_configurator_run_my_doc
erp5_configurator_standard
erp5_configurator_ung
\ No newline at end of file
bt5/erp5_configurator_standard/bt/template_test_id_list
View file @ b7580a4c
testStandardConfigurationWorkflow
\ No newline at end of file
testStandardConfigurationWorkflow
testRunMyDocConfigurationWorkflow
testMaxmaDemoConfigurationWorkflow
testUNGConfigurationWorkflow
\ No newline at end of file
bt5/erp5_configurator_ung/bt/change_log deleted 100644 → 0
View file @ 355cc80e
2011-08-04 Gabriel L. Oliveira
* Fix proxy of transition's scripts
2011-04-12 Lucas
* Added default image into business configuration.
2011-03-29 Gabriel
* Add unit test to UNG Configurator
2011-03-28 Gabriel
* Add script to configure UNG Web Site
2011-03-24 Gabriel
* Initial commit.
\ No newline at end of file
bt5/erp5_configurator_ung/bt/copyright_list deleted 100644 → 0
View file @ 355cc80e
Copyright (c) 2011 Nexedi SA
\ No newline at end of file
bt5/erp5_configurator_ung/bt/dependency_list deleted 100644 → 0
View file @ 355cc80e
erp5_configurator
\ No newline at end of file
bt5/erp5_configurator_ung/bt/license deleted 100644 → 0
View file @ 355cc80e
GPL
\ No newline at end of file
bt5/erp5_configurator_ung/bt/template_path_list deleted 100644 → 0
View file @ 355cc80e
business_configuration_module/ung_configuration
workflow_module/ung_configuration_workflow
workflow_module/ung_configuration_workflow/**
\ No newline at end of file
bt5/erp5_configurator_ung/bt/template_skin_id_list deleted 100644 → 0
View file @ 355cc80e
erp5_configurator_ung
\ No newline at end of file
bt5/erp5_configurator_ung/bt/template_test_id_list deleted 100644 → 0
View file @ 355cc80e
testUNGConfigurationWorkflow
\ No newline at end of file
bt5/erp5_configurator_ung/bt/title deleted 100644 → 0
View file @ 355cc80e
erp5_configurator_ung
\ No newline at end of file
bt5/erp5_configurator_ung/bt/version deleted 100644 → 0
View file @ 355cc80e
0.1
\ No newline at end of file
product/ERP5/tests/testTemplateTool.py
View file @ b7580a4c
......@@ -71,8 +71,10 @@ class TestTemplateTool(ERP5TypeTestCase):
def beforeTearDown(self):
self.tic()
mark_replaced_bt_list = ["erp5_odt_style", "erp5_pdm", 'erp5_accounting',
'erp5_workflow', 'erp5_configurator', 'erp5_configurator_ung',
'erp5_ingestion_mysql_innodb_catalog', "erp5_configurator_standard"]
'erp5_workflow', 'erp5_configurator',
'erp5_ingestion_mysql_innodb_catalog',
"erp5_configurator_standard"]
for bt_name in mark_replaced_bt_list:
bt = self.templates_tool.getInstalledBusinessTemplate(bt_name)
if (bt is not None) and bt.getInstallationState() in ['installed',
......@@ -564,7 +566,7 @@ class TestTemplateTool(ERP5TypeTestCase):
def test_installBusinessTemplatesFromRepository_install_dependency(self):
""" Test if update catalog is trigger when needed.
"""
bt5_name_list = ['erp5_configurator_ung', 'erp5_configurator_standard']
bt5_name_list = ['erp5_configurator_standard']
template_tool = self.portal.portal_templates
for repos in template_tool.getRepositoryList():
if "bootstrap" not in repos:
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7