[Erp5-report] r39073 rafael - in /erp5/trunk/bt5/erp5_upgrader: SkinTemplateItem/portal_ski...

[nobody at svn.erp5.org]

Author: rafael
Date: Tue Oct 12 21:23:44 2010
New Revision: 39073

URL: http://svn.erp5.org?rev=39073&view=rev
Log:
Define which bt5 will update catalog on Upgrader Signature.

Modified:
    erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
    erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeBusinessTemplateList.xml
    erp5/trunk/bt5/erp5_upgrader/bt/revision

Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml?rev=39073&r1=39072&r2=39073&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml [utf8] Tue Oct 12 21:23:44 2010
@@ -153,6 +153,11 @@ REQUIRED_BT5_ID_LIST = ("erp5_core",\n
                         "express_customisation",\n
                        )\n
 \n
+# A list bt5 which are required to upgrade catalog.\n
+# After the bt5 be updated, update catalog will be trigger.\n
+UPDATE_CATALOG_BT5_ID_LIST = ()\n
+\n
+\n
 # Call some scripts inside same transaction before or after BT update\n
 BEFORE_TRIGGERED_BT5_SCRIPT_ID_DICT = {}\n
 AFTER_TRIGGERED_BT5_SCRIPT_ID_DICT = {\'erp5_mysql_innodb_catalog\': (\'ERP5Site_updateSitePropertyForTestOnly\',)}\n
@@ -554,6 +559,7 @@ signature_dict = {\n
  , \'required_bt5_id_list\': REQUIRED_BT5_ID_LIST\n
    # Provides a list of bt5 which can be upgraded by the upgrader (if already installed)\n
  , \'upgradable_bt5_id_list\': UPGRADABLE_BT5_ID_LIST\n
+ , \'update_catalog_bt5_id_list\' : UPDATE_CATALOG_BT5_ID_LIST\n
  , \'before_triggered_bt5_id_dict\': BEFORE_TRIGGERED_BT5_SCRIPT_ID_DICT\n
  , \'after_triggered_bt5_id_dict\': AFTER_TRIGGERED_BT5_SCRIPT_ID_DICT\n
    # Provide a list of bt5 which require reinstallation\n
@@ -631,6 +637,7 @@ else:\n
                             <string>_getattr_</string>
                             <string>UPGRADABLE_BT5_ID_LIST</string>
                             <string>REQUIRED_BT5_ID_LIST</string>
+                            <string>UPDATE_CATALOG_BT5_ID_LIST</string>
                             <string>BEFORE_TRIGGERED_BT5_SCRIPT_ID_DICT</string>
                             <string>AFTER_TRIGGERED_BT5_SCRIPT_ID_DICT</string>
                             <string>REINSTALABLE_BT5_ID_LIST</string>

Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeBusinessTemplateList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeBusinessTemplateList.xml?rev=39073&r1=39072&r2=39073&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeBusinessTemplateList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeBusinessTemplateList.xml [utf8] Tue Oct 12 21:23:44 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -94,6 +91,8 @@ upgradable_bt5_id_list = signature[\'upg
 reinstalable_bt5_id_list = signature[\'reinstalable_bt5_id_list\']\n
 before_triggered_bt5_id_dict = signature[\'before_triggered_bt5_id_dict\']\n
 after_triggered_bt5_id_dict = signature[\'after_triggered_bt5_id_dict\']\n
+update_catalog_bt5_id_list = signature[\'update_catalog_bt5_id_list\']\n
+\n
 \n
 base_url_list = signature[\'bt5_base_url_list\']\n
 installed_bt5_title_list = [o.getTitle() for o in portal_templates.getInstalledBusinessTemplateList()]\n
@@ -117,7 +116,7 @@ def installBT5(bt5_title, previous_bt5, 
     # We must make sure all documents from previous installations \n
     # are already indexed (specially categories).\n
     kw[\'after_method_id\'] = "immediateReindexObject"\n
-  update_catalog = portal_templates.TemplateTool_isUpdateCatalogRequired(bt5_title)\n
+  update_catalog = bt5_title in update_catalog_bt5_id_list \n
   before_triggered_bt5_id_list = before_triggered_bt5_id_dict.get(bt5_title, ())\n
   after_triggered_bt5_id_list = after_triggered_bt5_id_dict.get(bt5_title, ())\n
   keep_original_list = signature[\'keep_original_dict\'].get(bt5_title, ())\n
@@ -227,6 +226,7 @@ return message_list\n
                             <string>reinstalable_bt5_id_list</string>
                             <string>before_triggered_bt5_id_dict</string>
                             <string>after_triggered_bt5_id_dict</string>
+                            <string>update_catalog_bt5_id_list</string>
                             <string>base_url_list</string>
                             <string>append</string>
                             <string>$append0</string>

Modified: erp5/trunk/bt5/erp5_upgrader/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/bt/revision?rev=39073&r1=39072&r2=39073&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] Tue Oct 12 21:23:44 2010
@@ -1 +1 @@
-534
\ No newline at end of file
+535
\ No newline at end of file