From 0ca2eb8d603a47d2a2fc10b12ad9ed66ba753927 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Fri, 14 Jan 2011 15:00:17 +0000
Subject: [PATCH] Added missing key and fix typo.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42347 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_upgrader/Alarm_senseFinalizeUpgrade.xml | 5 ++---
.../erp5_upgrader/ERP5Site_getUpgraderSignature.xml | 4 +++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml
index 224ff52616..9e20992ebe 100644
--- a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml
+++ b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml
@@ -63,9 +63,8 @@ alarm_dict = context.ERP5Site_getUpgraderSignature("alarm_dict")\n
if not alarm_dict.get(context.getId(), True):\n
return False\n
\n
-finalize_upgrade_script_list = context.ERP5Site_getUpgraderSignature(\'finalize_upgrade_script_list\')\n
-for script_id in finalize_upgrade_script_list:\n
- if len(getattr(context, script_id)()) > O:\n
+for script_id in context.ERP5Site_getUpgraderSignature(\'finalize_upgrade_script_list\'):\n
+ if len(getattr(context, script_id)()) > 0:\n
return True\n
\n
return False\n
diff --git a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
index 4490a05de4..ae979621ba 100644
--- a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
+++ b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
@@ -290,7 +290,7 @@ INTEGRITY_VERIFICATION_SCRIPT_ID_LIST = (\'ERP5Site_verifyUpgradeIntegrity\',\n
# be consider as After methods.\n
\n
FINALIZE_ALARM_SCRIPT = ( \'ERP5Site_upgradeGlobalPropertyList\',\n
- \'ERP5Site_upgradeValidationStateList\',\n
+ \'ERP5Site_upgradeObjectList\',\n
\'ERP5Site_upgradeWorkflowChain\',\n
\'ERP5Site_upgradePortalTypePropertySheet\',\n
\'ERP5Site_upgradeSecurity\',\n
@@ -363,6 +363,8 @@ signature_dict = {\n
, \'object_action_dict\': OBJECT_ACTION_DICT\n
# Provides a list of script ids that will be run after the upgrade to check the Instance Integrity\n
, \'integrity_verification_script_id_list\': INTEGRITY_VERIFICATION_SCRIPT_ID_LIST\n
+ # Provides a list of script ids that will be run during finalization step\n
+ , \'finalize_upgrade_script_list\': FINALIZE_ALARM_SCRIPT\n
# Provides a dict with expected catalog filter expressions\n
, \'catalog_filter_dict\': CATALOG_FILTER_DICT\n
# Provides a list of portal types to had rules updated.\n
--
2.30.9