diff --git a/bt5/erp5_crm/ExtensionTemplateItem/CRMMigration.py b/bt5/erp5_crm/ExtensionTemplateItem/CRMMigration.py index 4839b32fcb16c3d4c9ebb9f6f2758c1b27a9eb32..0e1e60eff44ebbfd91f36d2faf65d8e7a8b0825b 100644 --- a/bt5/erp5_crm/ExtensionTemplateItem/CRMMigration.py +++ b/bt5/erp5_crm/ExtensionTemplateItem/CRMMigration.py @@ -62,5 +62,5 @@ def migrateEventWorkflowHistory(self): return workflow_tool = portal.portal_workflow workflow_tool._jumpToStateFor(self, new_state) - return ['Event workflow migration on %s : %s -> %s' % ( - self.getPath(), current_state, new_state)] + return 'Event workflow migration on %s : %s -> %s' % ( + self.getPath(), current_state, new_state) diff --git a/bt5/erp5_crm/PathTemplateItem/portal_alarms/upgrader_migrate_event_workflow_history.xml b/bt5/erp5_crm/PathTemplateItem/portal_alarms/upgrader_migrate_event_workflow_history.xml index 9d12f722edcb31bec43abfdf6174314adc5933df..98ef88cdcf22a4bfecf0b6f280385e0c18a428ff 100644 --- a/bt5/erp5_crm/PathTemplateItem/portal_alarms/upgrader_migrate_event_workflow_history.xml +++ b/bt5/erp5_crm/PathTemplateItem/portal_alarms/upgrader_migrate_event_workflow_history.xml @@ -8,7 +8,7 @@ <dictionary> <item> <key> <string>active_sense_method_id</string> </key> - <value> <string>ERP5Site_migrateEventWorkflowHistory</string> </value> + <value> <string>EventModule_migrateEventWorkflowHistory</string> </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/ERP5Site_migrateEventWorkflowHistory.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_migrateEventWorkflowHistory.xml similarity index 81% rename from bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/ERP5Site_migrateEventWorkflowHistory.xml rename to bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_migrateEventWorkflowHistory.xml index be59ae254b8e5d067d249aa9d00cab29ba5ad8cf..36468547ce9b55849fe7de525ceee79fa40a8cc5 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/ERP5Site_migrateEventWorkflowHistory.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_migrateEventWorkflowHistory.xml @@ -50,12 +50,13 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>active_process = context.getPortalObject().portal_activities.newActiveProcess()\n -context.getPortalObject().ERP5Site_checkDataWithScript("Event_migrateEventWorkflowHistory",\n - tag="migrate",\n - relative_url="event_module",\n - full=1,\n - active_process=active_process.getPath())\n + <value> <string>portal = context.getPortalObject()\n +active_process = portal.portal_activities.newActiveProcess()\n +portal.event_module.recurseCallMethod(\n + \'Event_migrateEventWorkflowHistory\',\n + active_process=active_process,\n + min_depth=1,\n + max_depth=1)\n print "Migration started with process id: %s" %active_process.getPath()\n return printed\n </string> </value> @@ -66,7 +67,7 @@ return printed\n </item> <item> <key> <string>id</string> </key> - <value> <string>ERP5Site_migrateEventWorkflowHistory</string> </value> + <value> <string>EventModule_migrateEventWorkflowHistory</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index bccc87b80ef7af97083b3cda3f315937e89f1673..0d20fd5f67b14a87440799380051297331c93613 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -581 \ No newline at end of file +582 \ No newline at end of file