diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml index 31309d32272191ab3134e6a2437726267e4e81ac..4d1c21b92b9b62f7981eca3615209ef6798a55f4 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml @@ -71,41 +71,61 @@ <value> <string>from Products.ERP5Type.Document import newTempBase\n from Products.ERP5Type.Cache import CachingMethod\n \n -#Check dependencies, raise exception if a dependency is missing\n -context.checkDependencies()\n -\n def getModifiedObjectList(context):\n result = context.preinstall()\n - context.log(\'getModifiedObjectList cache filled\',\'\')\n - return result \n + return result\n \n -getModifiedObjectList = CachingMethod(getModifiedObjectList, id=\'BusinessTemplate_getModifiedObjectList\', cache_duration=36000)\n +getModifiedObjectList = CachingMethod(getModifiedObjectList,\n + id=\'BusinessTemplate_getModifiedObjectList\',\n + cache_duration=36000)\n \n modified_object_list = getModifiedObjectList(context)\n keys = modified_object_list.keys()\n keys.sort()\n \n -no_backup_list = [\'Action\', \'SiteProperty\', \'Module\', \'Document\', \'PropertySheet\', \'Extension\', \'Test\', \'Product\', \n - \'Role\', \'CatalogResultKey\', \'CatalogRelatedKey\', \'CatalogResultTable\', \'MessageTranslation\', \'LocalRoles\', \n - \'PortalTypeAllowedContentType\', \'PortalTypeHiddenContentType\', \'PortalTypePropertySheet\', \'PortalTypeBaseCategory\']\n +no_backup_list = [\'Action\', \'SiteProperty\', \'Module\', \'Document\',\n + \'PropertySheet\', \'Extension\', \'Test\', \'Product\', \'Role\',\n + \'CatalogResultKey\', \'CatalogRelatedKey\',\n + \'CatalogResultTable\', \'MessageTranslation\', \'LocalRoles\',\n + \'PortalTypeAllowedContentType\',\n + \'PortalTypeHiddenContentType\', \'PortalTypePropertySheet\',\n + \'PortalTypeBaseCategory\']\n \n i = 0\n object_list = []\n -for object_id in keys: \n +for object_id in keys:\n object_state, object_class = modified_object_list[object_id]\n line = newTempBase(context, \'tmp_install_%s\' %(str(i)))\n if object_state == \'New\':\n - line.edit(object_id=object_id, object_state=object_state, object_class=object_class, choice_item_list=[[\'Install\', \'install\'], [\'Do Nothing\', \'nothing\']])\n + line.edit(object_id=object_id, object_state=object_state,\n + object_class=object_class,\n + choice_item_list=[[\'Install\', \'install\'],\n + [\'Do Nothing\', \'nothing\']])\n elif object_state == \'Modified\':\n if object_class in no_backup_list:\n - line.edit(object_id=object_id, object_state=object_state, object_class=object_class, choice_item_list=[[\'Upgrade\', \'install\'], [\'Keep Original\', \'nothing\']])\n + line.edit(object_id=object_id, object_state=object_state,\n + object_class=object_class,\n + choice_item_list=[[\'Upgrade\', \'install\'],\n + [\'Keep Original\', \'nothing\']])\n else:\n - line.edit(object_id=object_id, object_state=object_state, object_class=object_class, choice_item_list=[[\'Backup And Upgrade\', \'backup\'], [\'Upgrade\', \'install\'], [\'Keep Original\', \'nothing\']])\n + line.edit(object_id=object_id, object_state=object_state,\n + object_class=object_class,\n + choice_item_list=[[\'Backup And Upgrade\', \'backup\'],\n + [\'Upgrade\', \'install\'],\n + [\'Keep Original\', \'nothing\']])\n elif object_state == \'Removed\':\n if object_class in no_backup_list:\n - line.edit(object_id=object_id, object_state=object_state, object_class=object_class, choice_item_list=[[\'Remove\', \'remove\'], [\'Keep Original\', \'nothing\']])\n + line.edit(object_id=object_id,\n + object_state=object_state,\n + object_class=object_class,\n + choice_item_list=[[\'Remove\', \'remove\'],\n + [\'Keep Original\', \'nothing\']])\n else:\n - line.edit(object_id=object_id, object_state=object_state, object_class=object_class, choice_item_list=[[\'Backup And Remove\', \'save_and_remove\'], [\'Remove\', \'remove\'], [\'Keep Original\', \'nothing\']])\n + line.edit(object_id=object_id, object_state=object_state,\n + object_class=object_class,\n + choice_item_list=[[\'Backup And Remove\', \'save_and_remove\'],\n + [\'Remove\', \'remove\'],\n + [\'Keep Original\', \'nothing\']])\n line.setUid(\'new_%s\' % object_id)\n object_list.append(line)\n i += 1 \n @@ -164,10 +184,10 @@ return object_list\n <string>newTempBase</string> <string>Products.ERP5Type.Cache</string> <string>CachingMethod</string> - <string>_getattr_</string> - <string>context</string> <string>getModifiedObjectList</string> + <string>context</string> <string>modified_object_list</string> + <string>_getattr_</string> <string>keys</string> <string>no_backup_list</string> <string>i</string> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index a862eb8444d443dbaf5db59f7e27d956cd7691d5..8bfa2f5ecdcecb29a2a68f2b68907198364f6c90 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -85 +86 \ No newline at end of file