From e610d7c5768d22aa031877d166f5a6ed44551059 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Thu, 22 Dec 2005 20:34:50 +0000 Subject: [PATCH] 2005-1222 yo * Add an optional parameter passive_commit to InventoryModule_reindexMovementList and ERP5Site_reindexAll. passive_commit is passed to reindexObject and recursiveReindexObject. * index_html does load local_pt any longer, but directly defines slots. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4871 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_categories/function.xml | 4 +- .../portal_categories/grade.xml | 4 +- .../erp5_core/ERP5Site_reindexAll.xml | 159 +++++++++--------- .../InventoryModule_reindexMovementList.xml | 44 ++--- .../my_url.xml | 2 +- .../my_import_file.xml | 2 +- .../erp5_html_style/index_html.xml | 83 ++++----- .../ERP5/bootstrap/erp5_core/bt/change_log | 4 + 8 files changed, 157 insertions(+), 145 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/function.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/function.xml index 23fd1c3ea2..57206c263a 100755 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/function.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/function.xml @@ -436,9 +436,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string>Function correspond to the task you do day by day.</string> </value> </item> <item> <key> <string>fallback_base_category_list</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/grade.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/grade.xml index ecdf7bd170..7c82633f9b 100755 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/grade.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/grade.xml @@ -397,9 +397,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string>Grade is like a job classification on which the employee pay is determined. It\'s also similar to military grade.</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml index a8c4e3f68f..19098b03f1 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml @@ -70,53 +70,53 @@ context.ERP5Site_updateTranslationTable(sql_catalog_id=sql_catalog_id)\n \n print "#### Indexing categories ####"\n -context.portal_categories.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n +context.portal_categories.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(context.portal_categories.objectValues()):\n - o.recursiveReindexObject(after_tag=\'module\',tag=\'category\', sql_catalog_id=sql_catalog_id)\n + o.recursiveReindexObject(after_tag=\'module\',tag=\'category\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n print "#### Indexing preferences ####"\n -context.portal_preferences.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n +context.portal_preferences.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(context.portal_preferences.objectValues(tag=\'module\')):\n - o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n + o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n # We index simulation first to make sure we can calculate tests (ie. related quantity)\n print "#### Indexing simulation ####"\n -context.portal_simulation.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n +context.portal_simulation.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(context.portal_simulation.objectValues()):\n - o.recursiveReindexObject(after_tag=(\'module\',\'category\',\'document\'),tag=\'simulation\',priority=3, sql_catalog_id=sql_catalog_id)\n + o.recursiveReindexObject(after_tag=(\'module\',\'category\',\'document\'),tag=\'simulation\',priority=3, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n # We index templates secondly\n print "#### Indexing templates ####"\n -context.portal_templates.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n +context.portal_templates.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(context.portal_templates.objectValues()):\n - o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n + o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n # Next we index applied rules\n print "#### Indexing applied rules ####"\n -context.portal_rules.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n +context.portal_rules.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(context.portal_rules.objectValues()):\n - o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n + o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n # Next we index delivery builders\n print "#### Indexing delivery builders ####"\n -context.portal_deliveries.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n +context.portal_deliveries.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(context.portal_deliveries.objectValues()):\n - o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n + o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n # Next we index order builders\n print "#### Indexing order builders ####"\n -context.portal_orders.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n +context.portal_orders.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(context.portal_orders.objectValues()):\n - o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n + o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n # Then we index everything except inventories\n for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):\n print "#### Indexing contents inside folder %s ####" % folder.id\n if folder.getId() not in (\'inventory_module\',):\n - folder.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n + folder.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(folder.objectValues()):\n try:\n - o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n + o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n except:\n #raise RuntimeError, o.getRelativeUrl()\n raise\n @@ -126,74 +126,77 @@ for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",) for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):\n if folder.getId() in (\'inventory_module\',):\n print "#### Indexing contents inside folder %s ####" % folder.id\n - folder.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n + folder.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n for o in list(folder.objectValues()):\n - o.recursiveReindexObject(after_tag=(\'module\',\'document\',\'category\'),tag=\'inventory\',priority=2, sql_catalog_id=sql_catalog_id)\n + o.recursiveReindexObject(after_tag=(\'module\',\'document\',\'category\'),tag=\'inventory\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n # start activty from simulation because the erp5site is not an active object\n -context.portal_simulation.activate(after_tag=(\'inventory\',\'simulation\'),priority=3).InventoryModule_reindexMovementList(sql_catalog_id=sql_catalog_id)\n +context.portal_simulation.activate(after_tag=(\'inventory\',\'simulation\'),priority=3).InventoryModule_reindexMovementList(sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n \n return printed\n </string> </value> </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGUAAGQBAIQBAFoBAGQAAFMoAgAAAE5jAQAAAAsAAABhAAAA -QwAAAHNmBgAAdAAAgwAAfQIAfAIABGQBAAJJSnQCAHQDAGQCAIMCAGQDAHwAAIMAAQF8AgAEZAQA -AklKdAIAdAIAdAMAZAUAgwIAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhRAHQFAHQGAHQCAHQCAHQD -AGQFAIMCAGQJAIMCAIMAAIMBAIMBAERdKAB9BwB0AgB8BwBkCgCDAgBkCwBkCABkBwBkDABkAwB8 -AACDAAMBcYAAV3wCAARkDQACSUp0AgB0AgB0AwBkDgCDAgBkBgCDAgBkBwBkCABkAwB8AACDAAIB -eGMAdAUAdAYAdAIAdAIAdAMAZA4AgwIAZAkAgwIAZAcAZAgAgwABgwEAgwEARF00AH0HAHQCAHwH -AGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQPAGQQAGQRAGQDAHwAAIMABAFxCQFXfAIABGQSAAJJSnQC -AHQCAHQDAGQTAIMCAGQGAIMCAGQHAGQIAGQDAHwAAIMAAgF4YAB0BQB0BgB0AgB0AgB0AwBkEwCD -AgBkCQCDAgCDAACDAQCDAQBEXTcAfQcAdAIAfAcAZAoAgwIAZAsAZAgAZAwAZA8AZgMAZAcAZBQA -ZBAAZBUAZAMAfAAAgwAEAXGYAVd8AgAEZBYAAklKdAIAdAIAdAMAZBcAgwIAZAYAgwIAZAcAZAgA -ZAMAfAAAgwACAXhdAHQFAHQGAHQCAHQCAHQDAGQXAIMCAGQJAIMCAIMAAIMBAIMBAERdNAB9BwB0 -AgB8BwBkBgCDAgBkCwBkCABkDABmAgBkBwBkDwBkEABkEQBkAwB8AACDAAQBcSoCV3wCAARkGAAC -SUp0AgB0AgB0AwBkGQCDAgBkBgCDAgBkBwBkCABkAwB8AACDAAIBeF0AdAUAdAYAdAIAdAIAdAMA -ZBkAgwIAZAkAgwIAgwAAgwEAgwEARF00AH0HAHQCAHwHAGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQP -AGQQAGQRAGQDAHwAAIMABAFxuQJXfAIABGQaAAJJSnQCAHQCAHQDAGQbAIMCAGQGAIMCAGQHAGQI -AGQDAHwAAIMAAgF4XQB0BQB0BgB0AgB0AgB0AwBkGwCDAgBkCQCDAgCDAACDAQCDAQBEXTQAfQcA -dAIAfAcAZAYAgwIAZAsAZAgAZAwAZgIAZAcAZA8AZBAAZBEAZAMAfAAAgwAEAXFIA1d8AgAEZBwA -AklKdAIAdAIAdAMAZB0AgwIAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhdAHQFAHQGAHQCAHQCAHQD -AGQdAIMCAGQJAIMCAIMAAIMBAIMBAERdNAB9BwB0AgB8BwBkBgCDAgBkCwBkCABkDABmAgBkBwBk -DwBkEABkEQBkAwB8AACDAAQBcdcDV3ghAXQFAHQCAHQCAHQCAHQDAGQeAIMCAGQfAIMCAIMAAGQJ -AIMCAGQgAGYBAIMBAIMBAERd7AB9CAB8AgAEZCEAdAIAfAgAZCIAgwIAFgJJSnQCAHwIAGQjAIMC -AIMAAGQkAGYBAGoHAG+zAAF0AgB8CABkBgCDAgBkBwBkCABkAwB8AACDAAIBeJQAdAUAdAYAdAIA -fAgAZAkAgwIAgwAAgwEAgwEARF1wAH0HAHkyAHQCAHwHAGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQP -AGQQAGQRAGQDAHwAAIMABAFXcbcEAQEBggAAdAkAZCUAdAoAdAIAfAgAZCMAgwIAgwAAgwEAdAoA -fAcAgwEAZgIAFoICAHG3BFhxtwRXcUMEAXFDBFd46AB0BQB0AgB0AgB0AgB0AwBkHgCDAgBkHwCD -AgCDAABkCQCDAgBkIABmAQCDAQCDAQBEXbMAfQgAdAIAfAgAZCMAgwIAgwAAZCQAZgEAagYAb5EA -AXwCAARkIQB0AgB8CABkIgCDAgAWAklKdAIAfAgAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhbAHQF -AHQGAHQCAHwIAGQJAIMCAIMAAIMBAIMBAERdNwB9BwB0AgB8BwBkCgCDAgBkCwBkCABkDwBkDABm -AwBkBwBkJgBkEABkEQBkAwB8AACDAAQBcdsFV3FnBQFxZwVXdAIAdAIAdAIAdAMAZBMAgwIAZCcA -gwIAZAsAZCYAZBQAZgIAZBAAZBUAgwACZCgAgwIAZAMAfAAAgwABAXwCAIMAAFNkAABTKCkAAABO -cx8AAAAjIyMjIEluZGV4aW5nIHRyYW5zbGF0aW9ucyAjIyMjcx8AAABFUlA1U2l0ZV91cGRhdGVU -cmFuc2xhdGlvblRhYmxlcw4AAABzcWxfY2F0YWxvZ19pZHMdAAAAIyMjIyBJbmRleGluZyBjYXRl -Z29yaWVzICMjIyNzEQAAAHBvcnRhbF9jYXRlZ29yaWVzcw0AAAByZWluZGV4T2JqZWN0cwMAAAB0 -YWdzBgAAAG1vZHVsZXMMAAAAb2JqZWN0VmFsdWVzcxYAAAByZWN1cnNpdmVSZWluZGV4T2JqZWN0 -cwkAAABhZnRlcl90YWdzCAAAAGNhdGVnb3J5cx4AAAAjIyMjIEluZGV4aW5nIHByZWZlcmVuY2Vz -ICMjIyNzEgAAAHBvcnRhbF9wcmVmZXJlbmNlc3MIAAAAZG9jdW1lbnRzCAAAAHByaW9yaXR5aQIA -AABzHQAAACMjIyMgSW5kZXhpbmcgc2ltdWxhdGlvbiAjIyMjcxEAAABwb3J0YWxfc2ltdWxhdGlv -bnMKAAAAc2ltdWxhdGlvbmkDAAAAcxwAAAAjIyMjIEluZGV4aW5nIHRlbXBsYXRlcyAjIyMjcxAA -AABwb3J0YWxfdGVtcGxhdGVzcyAAAAAjIyMjIEluZGV4aW5nIGFwcGxpZWQgcnVsZXMgIyMjI3MM -AAAAcG9ydGFsX3J1bGVzcyQAAAAjIyMjIEluZGV4aW5nIGRlbGl2ZXJ5IGJ1aWxkZXJzICMjIyNz -EQAAAHBvcnRhbF9kZWxpdmVyaWVzcyEAAAAjIyMjIEluZGV4aW5nIG9yZGVyIGJ1aWxkZXJzICMj -IyNzDQAAAHBvcnRhbF9vcmRlcnNzCgAAAHBvcnRhbF91cmxzDwAAAGdldFBvcnRhbE9iamVjdHML -AAAARVJQNSBGb2xkZXJzLAAAACMjIyMgSW5kZXhpbmcgY29udGVudHMgaW5zaWRlIGZvbGRlciAl -cyAjIyMjcwIAAABpZHMFAAAAZ2V0SWRzEAAAAGludmVudG9yeV9tb2R1bGVzFgAAAGVycm9yOiBm -b2xkZXI9JXMsIG89JXNzCQAAAGludmVudG9yeXMIAAAAYWN0aXZhdGVzIwAAAEludmVudG9yeU1v -ZHVsZV9yZWluZGV4TW92ZW1lbnRMaXN0KAsAAABzBwAAAF9wcmludF9zBgAAAF9wcmludHMJAAAA -X2dldGF0dHJfcwcAAABjb250ZXh0cw4AAABzcWxfY2F0YWxvZ19pZHMJAAAAX2dldGl0ZXJfcwQA -AABsaXN0cwEAAABvcwYAAABmb2xkZXJzDAAAAFJ1bnRpbWVFcnJvcnMEAAAAcmVwcigLAAAAcw4A -AABzcWxfY2F0YWxvZ19pZHMHAAAAX3ByaW50X3MGAAAAX3ByaW50cwkAAABfZ2V0YXR0cl9zBwAA -AGNvbnRleHRzCQAAAF9nZXRpdGVyX3MEAAAAbGlzdHMBAAAAb3MGAAAAZm9sZGVycwwAAABSdW50 -aW1lRXJyb3JzBAAAAHJlcHIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzEwAAAEVSUDVT -aXRlX3JlaW5kZXhBbGwBAAAAc3IAAAAWARMCEAEfASgACQEjAhABHwEuAAkBLwMQAR8BKAAJATID -EAEfASgACQEvAxABHwEoAAkBLwMQAR8BKAAJAS8DEAEfASgACQEvAzQABgEXAR8BGQEfAAYBBgEy -AwMBOwM0AAYBHAEaARkBHwAJAUMDNAIoAgAAAHMEAAAATm9uZXMTAAAARVJQNVNpdGVfcmVpbmRl -eEFsbCgCAAAAcwQAAABOb25lcxMAAABFUlA1U2l0ZV9yZWluZGV4QWxsKAAAAAAoAAAAAHMPAAAA -U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGQBAGQCAIQCAFoBAGQAAFMoAwAAAE5pAQAAAGMCAAAA +DAAAAGwAAABDAAAAc9gGAAB0AACDAAB9AwB8AwAEZAEAAklKdAIAdAMAZAIAgwIAZAMAfAAAgwAB +AXwDAARkBAACSUp0AgB0AgB0AwBkBQCDAgBkBgCDAgBkBwBkCABkAwB8AABkCQB8AQCDAAMBeFcA +dAYAdAcAdAIAdAIAdAMAZAUAgwIAZAoAgwIAgwAAgwEAgwEARF0uAH0IAHQCAHwIAGQLAIMCAGQM +AGQIAGQHAGQNAGQDAHwAAGQJAHwBAIMABAFxhgBXfAMABGQOAAJJSnQCAHQCAHQDAGQPAIMCAGQG +AIMCAGQHAGQIAGQDAHwAAGQJAHwBAIMAAwF4aQB0BgB0BwB0AgB0AgB0AwBkDwCDAgBkCgCDAgBk +BwBkCACDAAGDAQCDAQBEXToAfQgAdAIAfAgAZAsAgwIAZAwAZAgAZA0AZgIAZAcAZBAAZBEAZBIA +ZAMAfAAAZAkAfAEAgwAFAXEbAVd8AwAEZBMAAklKdAIAdAIAdAMAZBQAgwIAZAYAgwIAZAcAZAgA +ZAMAfAAAZAkAfAEAgwADAXhmAHQGAHQHAHQCAHQCAHQDAGQUAIMCAGQKAIMCAIMAAIMBAIMBAERd +PQB9CAB0AgB8CABkCwCDAgBkDABkCABkDQBkEABmAwBkBwBkFQBkEQBkFgBkAwB8AABkCQB8AQCD +AAUBcbYBV3wDAARkFwACSUp0AgB0AgB0AwBkGACDAgBkBgCDAgBkBwBkCABkAwB8AABkCQB8AQCD +AAMBeGMAdAYAdAcAdAIAdAIAdAMAZBgAgwIAZAoAgwIAgwAAgwEAgwEARF06AH0IAHQCAHwIAGQG +AIMCAGQMAGQIAGQNAGYCAGQHAGQQAGQRAGQSAGQDAHwAAGQJAHwBAIMABQFxVAJXfAMABGQZAAJJ +SnQCAHQCAHQDAGQaAIMCAGQGAIMCAGQHAGQIAGQDAHwAAGQJAHwBAIMAAwF4YwB0BgB0BwB0AgB0 +AgB0AwBkGgCDAgBkCgCDAgCDAACDAQCDAQBEXToAfQgAdAIAfAgAZAsAgwIAZAwAZAgAZA0AZgIA +ZAcAZBAAZBEAZBIAZAMAfAAAZAkAfAEAgwAFAXHvAld8AwAEZBsAAklKdAIAdAIAdAMAZBwAgwIA +ZAYAgwIAZAcAZAgAZAMAfAAAZAkAfAEAgwADAXhjAHQGAHQHAHQCAHQCAHQDAGQcAIMCAGQKAIMC +AIMAAIMBAIMBAERdOgB9CAB0AgB8CABkBgCDAgBkDABkCABkDQBmAgBkBwBkEABkEQBkEgBkAwB8 +AABkCQB8AQCDAAUBcYoDV3wDAARkHQACSUp0AgB0AgB0AwBkHgCDAgBkBgCDAgBkBwBkCABkAwB8 +AABkCQB8AQCDAAMBeGMAdAYAdAcAdAIAdAIAdAMAZB4AgwIAZAoAgwIAgwAAgwEAgwEARF06AH0I +AHQCAHwIAGQGAIMCAGQMAGQIAGQNAGYCAGQHAGQQAGQRAGQSAGQDAHwAAGQJAHwBAIMABQFxJQRX +eC0BdAYAdAIAdAIAdAIAdAMAZB8AgwIAZCAAgwIAgwAAZAoAgwIAZCEAZgEAgwEAgwEARF34AH0J +AHwDAARkIgB0AgB8CQBkIwCDAgAWAklKdAIAfAkAZCQAgwIAgwAAZCUAZgEAagcAb78AAXQCAHwJ +AGQGAIMCAGQHAGQIAGQDAHwAAGQJAHwBAIMAAwF4mgB0BgB0BwB0AgB8CQBkCgCDAgCDAACDAQCD +AQBEXXYAfQgAeTgAdAIAfAgAZAsAgwIAZAwAZAgAZA0AZgIAZAcAZBAAZBEAZBIAZAMAfAAAZAkA +fAEAgwAFAVdxEQUBAQGCAAB0CgBkJgB0CwB0AgB8CQBkJACDAgCDAACDAQB0CwB8CACDAQBmAgAW +ggIAcREFWHERBVdxlwQBcZcEV3j0AHQGAHQCAHQCAHQCAHQDAGQfAIMCAGQgAIMCAIMAAGQKAIMC +AGQhAGYBAIMBAIMBAERdvwB9CQB0AgB8CQBkJACDAgCDAABkJQBmAQBqBgBvnQABfAMABGQiAHQC +AHwJAGQjAIMCABYCSUp0AgB8CQBkBgCDAgBkBwBkCABkAwB8AABkCQB8AQCDAAMBeGEAdAYAdAcA +dAIAfAkAZAoAgwIAgwAAgwEAgwEARF09AH0IAHQCAHwIAGQLAIMCAGQMAGQIAGQQAGQNAGYDAGQH +AGQnAGQRAGQSAGQDAHwAAGQJAHwBAIMABQFxQQZXcccFAXHHBVd0AgB0AgB0AgB0AwBkFACDAgBk +KACDAgBkDABkJwBkFQBmAgBkEQBkFgCDAAJkKQCDAgBkAwB8AABkCQB8AQCDAAIBfAMAgwAAU2QA +AFMoKgAAAE5zHwAAACMjIyMgSW5kZXhpbmcgdHJhbnNsYXRpb25zICMjIyNzHwAAAEVSUDVTaXRl +X3VwZGF0ZVRyYW5zbGF0aW9uVGFibGVzDgAAAHNxbF9jYXRhbG9nX2lkcx0AAAAjIyMjIEluZGV4 +aW5nIGNhdGVnb3JpZXMgIyMjI3MRAAAAcG9ydGFsX2NhdGVnb3JpZXNzDQAAAHJlaW5kZXhPYmpl +Y3RzAwAAAHRhZ3MGAAAAbW9kdWxlcw4AAABwYXNzaXZlX2NvbW1pdHMMAAAAb2JqZWN0VmFsdWVz +cxYAAAByZWN1cnNpdmVSZWluZGV4T2JqZWN0cwkAAABhZnRlcl90YWdzCAAAAGNhdGVnb3J5cx4A +AAAjIyMjIEluZGV4aW5nIHByZWZlcmVuY2VzICMjIyNzEgAAAHBvcnRhbF9wcmVmZXJlbmNlc3MI +AAAAZG9jdW1lbnRzCAAAAHByaW9yaXR5aQIAAABzHQAAACMjIyMgSW5kZXhpbmcgc2ltdWxhdGlv +biAjIyMjcxEAAABwb3J0YWxfc2ltdWxhdGlvbnMKAAAAc2ltdWxhdGlvbmkDAAAAcxwAAAAjIyMj +IEluZGV4aW5nIHRlbXBsYXRlcyAjIyMjcxAAAABwb3J0YWxfdGVtcGxhdGVzcyAAAAAjIyMjIElu +ZGV4aW5nIGFwcGxpZWQgcnVsZXMgIyMjI3MMAAAAcG9ydGFsX3J1bGVzcyQAAAAjIyMjIEluZGV4 +aW5nIGRlbGl2ZXJ5IGJ1aWxkZXJzICMjIyNzEQAAAHBvcnRhbF9kZWxpdmVyaWVzcyEAAAAjIyMj +IEluZGV4aW5nIG9yZGVyIGJ1aWxkZXJzICMjIyNzDQAAAHBvcnRhbF9vcmRlcnNzCgAAAHBvcnRh +bF91cmxzDwAAAGdldFBvcnRhbE9iamVjdHMLAAAARVJQNSBGb2xkZXJzLAAAACMjIyMgSW5kZXhp +bmcgY29udGVudHMgaW5zaWRlIGZvbGRlciAlcyAjIyMjcwIAAABpZHMFAAAAZ2V0SWRzEAAAAGlu +dmVudG9yeV9tb2R1bGVzFgAAAGVycm9yOiBmb2xkZXI9JXMsIG89JXNzCQAAAGludmVudG9yeXMI +AAAAYWN0aXZhdGVzIwAAAEludmVudG9yeU1vZHVsZV9yZWluZGV4TW92ZW1lbnRMaXN0KAwAAABz +BwAAAF9wcmludF9zBgAAAF9wcmludHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cw4AAABzcWxf +Y2F0YWxvZ19pZHMOAAAAcGFzc2l2ZV9jb21taXRzCQAAAF9nZXRpdGVyX3MEAAAAbGlzdHMBAAAA +b3MGAAAAZm9sZGVycwwAAABSdW50aW1lRXJyb3JzBAAAAHJlcHIoDAAAAHMOAAAAc3FsX2NhdGFs +b2dfaWRzDgAAAHBhc3NpdmVfY29tbWl0cwcAAABfcHJpbnRfcwYAAABfcHJpbnRzCQAAAF9nZXRh +dHRyX3MHAAAAY29udGV4dHMJAAAAX2dldGl0ZXJfcwQAAABsaXN0cwEAAABvcwYAAABmb2xkZXJz +DAAAAFJ1bnRpbWVFcnJvcnMEAAAAcmVwcigAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMT +AAAARVJQNVNpdGVfcmVpbmRleEFsbAEAAABzcgAAABYBEwIQASUBKAAJASkCEAElAS4ACQE1AxAB +JQEoAAkBOAMQASUBKAAJATUDEAElASgACQE1AxABJQEoAAkBNQMQASUBKAAJATUDNAAGARcBHwEf +AR8ABgEGATgDAwE7AzQABgEcARoBHwEfAAkBSQM6AigCAAAAcwQAAABOb25lcxMAAABFUlA1U2l0 +ZV9yZWluZGV4QWxsKAIAAABzBAAAAE5vbmVzEwAAAEVSUDVTaXRlX3JlaW5kZXhBbGwoAAAAACgA +AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -201,7 +204,7 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>sql_catalog_id=None</string> </value> + <value> <string>sql_catalog_id=None, passive_commit=1</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -221,13 +224,14 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>sql_catalog_id</string> + <string>passive_commit</string> <string>_print_</string> <string>_print</string> <string>_getattr_</string> @@ -251,6 +255,7 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> <value> <tuple> <none/> + <int>1</int> </tuple> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml index 635d59e25c..0ab6f09921 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml @@ -80,30 +80,32 @@ for o in [ x.getObject() for x in context.portal_catalog(\n o.reindexObject( after_tag = \'inventory_%i\' % count\n , tag = \'inventory_%i\' % (count+1)\n , sql_catalog_id = sql_catalog_id\n + , passive_commit=passive_commit\n )\n count += 1\n </string> </value> </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGUAAGQBAIQBAFoBAGQAAFMoAgAAAE5jAQAAAAsAAAAUAAAA -SwAAAHO/AAAAZAEAfQIAeLIAdAEAZwAABGkCAH0FAHQBAHQEAHQFAGQCAIMCAGQDAGQEAGQFAGYC -AGQGAHQGAGQHAGQIAGQJAGYCAGcBAGQKAHwAAIMABIMBAERdHAB9CQB8BQB0BAB8CQBkCwCDAgCD -AACDAQABcVMAfgUAgwEARF0+AH0KAHQEAHwKAGQMAIMCAGQNAGQOAHwCABZkDwBkDgB8AgBkAQAX -FmQKAHwAAIMAAwF8AgBkAQA3fQIAcXkAV2QAAFMoEAAAAE5pAQAAAHMOAAAAcG9ydGFsX2NhdGFs -b2dzCwAAAHBvcnRhbF90eXBlcw4AAABJbnZlbnRvcnkgQ2VsbHMOAAAASW52ZW50b3J5IExpbmVz -BQAAAGxpbWl0cwcAAABzb3J0X29ucxMAAABtb3ZlbWVudC5zdGFydF9kYXRlcwkAAABhc2NlbmRp -bmdzDgAAAHNxbF9jYXRhbG9nX2lkcwkAAABnZXRPYmplY3RzDQAAAHJlaW5kZXhPYmplY3RzCQAA -AGFmdGVyX3RhZ3MMAAAAaW52ZW50b3J5XyVpcwMAAAB0YWcoCgAAAHMFAAAAY291bnRzCQAAAF9n -ZXRpdGVyX3MGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0 -cwQAAABOb25lcw4AAABzcWxfY2F0YWxvZ19pZHMBAAAAeHMBAAAAbygLAAAAcw4AAABzcWxfY2F0 -YWxvZ19pZHMCAAAAa3dzBQAAAGNvdW50cwkAAABfZ2V0aXRlcl9zBgAAAGFwcGVuZHMIAAAAJGFw -cGVuZDBzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMEAAAATm9uZXMBAAAAeHMBAAAAbygAAAAA -KAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3Zl -bWVudExpc3QBAAAAcxQAAAAAAQYDIgEMAQYBDwE5AxkBCwEHAigCAAAAcwQAAABOb25lcyMAAABJ -bnZlbnRvcnlNb2R1bGVfcmVpbmRleE1vdmVtZW50TGlzdCgCAAAAcwQAAABOb25lcyMAAABJbnZl -bnRvcnlNb2R1bGVfcmVpbmRleE1vdmVtZW50TGlzdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0 -aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGQBAGQCAIQCAFoBAGQAAFMoAwAAAE5pAQAAAGMCAAAA +DAAAABYAAABLAAAAc8UAAABkAQB9AwB4uAB0AQBnAAAEaQIAfQYAdAEAdAQAdAUAZAIAgwIAZAMA +ZAQAZAUAZgIAZAYAdAYAZAcAZAgAZAkAZgIAZwEAZAoAfAAAgwAEgwEARF0cAH0KAHwGAHQEAHwK +AGQLAIMCAIMAAIMBAAFxUwB+BgCDAQBEXUQAfQsAdAQAfAsAZAwAgwIAZA0AZA4AfAMAFmQPAGQO +AHwDAGQBABcWZAoAfAAAZBAAfAEAgwAEAXwDAGQBADd9AwBxeQBXZAAAUygRAAAATmkBAAAAcw4A +AABwb3J0YWxfY2F0YWxvZ3MLAAAAcG9ydGFsX3R5cGVzDgAAAEludmVudG9yeSBDZWxscw4AAABJ +bnZlbnRvcnkgTGluZXMFAAAAbGltaXRzBwAAAHNvcnRfb25zEwAAAG1vdmVtZW50LnN0YXJ0X2Rh +dGVzCQAAAGFzY2VuZGluZ3MOAAAAc3FsX2NhdGFsb2dfaWRzCQAAAGdldE9iamVjdHMNAAAAcmVp +bmRleE9iamVjdHMJAAAAYWZ0ZXJfdGFncwwAAABpbnZlbnRvcnlfJWlzAwAAAHRhZ3MOAAAAcGFz +c2l2ZV9jb21taXQoCwAAAHMFAAAAY291bnRzCQAAAF9nZXRpdGVyX3MGAAAAYXBwZW5kcwgAAAAk +YXBwZW5kMHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwQAAABOb25lcw4AAABzcWxfY2F0YWxv +Z19pZHMBAAAAeHMBAAAAb3MOAAAAcGFzc2l2ZV9jb21taXQoDAAAAHMOAAAAc3FsX2NhdGFsb2df +aWRzDgAAAHBhc3NpdmVfY29tbWl0cwIAAABrd3MFAAAAY291bnRzCQAAAF9nZXRpdGVyX3MGAAAA +YXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwQAAABOb25lcwEA +AAB4cwEAAABvKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcyMAAABJbnZlbnRvcnlNb2R1 +bGVfcmVpbmRleE1vdmVtZW50TGlzdAEAAABzFgAAAAABBgMiAQwBBgEPATkDGQELAQYBBwIoAgAA +AHMEAAAATm9uZXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3ZlbWVudExpc3QoAgAAAHME +AAAATm9uZXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3ZlbWVudExpc3QoAAAAACgAAAAA +cw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -111,7 +113,7 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>sql_catalog_id=None, **kw</string> </value> + <value> <string>sql_catalog_id=None, passive_commit=1, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -131,13 +133,14 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>sql_catalog_id</string> + <string>passive_commit</string> <string>kw</string> <string>count</string> <string>_getiter_</string> @@ -161,6 +164,7 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> <value> <tuple> <none/> + <int>1</int> </tuple> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadBusinessTemplateDialog/my_url.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadBusinessTemplateDialog/my_url.xml index b559963972..b6a6d4f7a6 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadBusinessTemplateDialog/my_url.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadBusinessTemplateDialog/my_url.xml @@ -177,7 +177,7 @@ </item> <item> <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> + <value> <int>1024</int> </value> </item> <item> <key> <string>display_width</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewImportBusinessTemplateDialog/my_import_file.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewImportBusinessTemplateDialog/my_import_file.xml index db41486e52..2cf6aa50f6 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewImportBusinessTemplateDialog/my_import_file.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewImportBusinessTemplateDialog/my_import_file.xml @@ -159,7 +159,7 @@ </item> <item> <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> + <value> <int>1024</int> </value> </item> <item> <key> <string>display_width</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_html_style/index_html.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_html_style/index_html.xml index e1908a2894..fc480f51a2 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_html_style/index_html.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_html_style/index_html.xml @@ -54,7 +54,7 @@ \n <span tal:replace="nothing">\n <!--\n -Copyright (c) 2004 Nexedi SARL and Contributors. All Rights Reserved.\n +Copyright (c) 2004,2005 Nexedi SARL and Contributors. All Rights Reserved.\n Yoshinori Okuji <yo@nexedi.com>\n \n This program is Free Software; you can redistribute it and/or\n @@ -87,26 +87,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </head>\n \n <body style="position: relative">\n -\n -<div metal:fill-slot="header"\n - tal:define="global has_local python: \'local_pt\' in here.objectIds();\n - global util_macros here/index_html_utils/macros;\n - " >\n -\n - <div tal:condition="not: has_local">\n -\n - <div metal:use-macro="util_macros/index_header" />\n -\n - </div>\n -\n - <div tal:condition="has_local">\n -\n - <div metal:use-macro="here/local_pt/macros/header | default">\n - \'local_pt\' header goes here.\n - </div>\n -\n - </div>\n -\n +<div metal:fill-slot="header">\n </div><!-- header slot -->\n \n <div metal:fill-slot="main">\n @@ -114,30 +95,48 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <div id="content_well"\n style="float: left; top: 0; width: 80%;">\n \n - <div tal:condition="not: has_local">\n -\n - <br />\n -\n - <div metal:use-macro="util_macros/index_content" />\n -\n - <div metal:use-macro="util_macros/index_links" />\n -\n - <div metal:use-macro="util_macros/index_folders" />\n -\n - </div>\n -\n - <div tal:condition="has_local">\n -\n - <div metal:use-macro="here/local_pt/macros/body | default">\n - \'local_pt\' body goes here.\n - </div>\n -\n - </div>\n + <span tal:condition="python: not here.portal_membership.isAnonymousUser()">\n + <br/>\n + <br/>\n + <br/>\n + <br/>\n + <h2 align="center" i18n:translate="" i18n:domain="ui">\n + Welcome to ERP5\n + </h2>\n + <table border="1" align="center">\n + <tr tal:define="module_list python:here.ERP5Site_getModuleItemList();\n + module_len python:len(module_list);\n + col_size python:12;\n + col_len python:(module_len + col_size) / col_size">\n + <td>\n + <a href="http://www.erp5.org/"><img src="images/erp5_logo.png" alt="ERP5 Logo" /></a>\n + </td>\n + <tal:block tal:repeat="col_no python:range(col_len)">\n + <td valign="top" class="ModuleShortcut">\n + <tal:block tal:repeat="module python:module_list[col_size*col_no:min(col_size*(col_no+1),module_len)] ">\n + <p>\n + <a href="person"\n + tal:content="python: module[0]"\n + tal:attributes="href python: module[1] + \'/view\'">\n + Person\n + </a>\n + </p>\n + </tal:block>\n + </td>\n + </tal:block>\n + </tr>\n + </table>\n + </span>\n +\n + <span tal:condition="python: here.portal_membership.isAnonymousUser()">\n + <p tal:define="dummy python:request.RESPONSE.redirect(\'%s/login_form\' % here.absolute_url())"/>\n + </span>\n \n </div>\n \n </div>\n \n +\n </body>\n </html>\n @@ -156,6 +155,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <key> <string>id</string> </key> <value> <string>index_html</string> </value> </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> </dictionary> </pickle> </record> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index b50b1b3144..5a894638b2 100755 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,7 @@ +2005-1222 yo +* Add an optional parameter passive_commit to InventoryModule_reindexMovementList and ERP5Site_reindexAll. passive_commit is passed to reindexObject and recursiveReindexObject. +* index_html does load local_pt any longer, but directly defines slots. + 2005-12-21 Kevin * "Section Category" in AccountingPreferences_view is no longer required. * Display None category in Section Category list of Preference_view form. -- 2.30.9