Commit e610d7c5 authored by Yoshinori Okuji's avatar Yoshinori Okuji

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
parent acf1401b
...@@ -436,9 +436,7 @@ ...@@ -436,9 +436,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <value> <string>Function correspond to the task you do day by day.</string> </value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>fallback_base_category_list</string> </key> <key> <string>fallback_base_category_list</string> </key>
......
...@@ -397,9 +397,7 @@ ...@@ -397,9 +397,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<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>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -70,53 +70,53 @@ ...@@ -70,53 +70,53 @@
context.ERP5Site_updateTranslationTable(sql_catalog_id=sql_catalog_id)\n context.ERP5Site_updateTranslationTable(sql_catalog_id=sql_catalog_id)\n
\n \n
print "#### Indexing categories ####"\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 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 \n
print "#### Indexing preferences ####"\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 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 \n
# We index simulation first to make sure we can calculate tests (ie. related quantity)\n # We index simulation first to make sure we can calculate tests (ie. related quantity)\n
print "#### Indexing simulation ####"\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 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 \n
# We index templates secondly\n # We index templates secondly\n
print "#### Indexing templates ####"\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 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 \n
# Next we index applied rules\n # Next we index applied rules\n
print "#### Indexing 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 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 \n
# Next we index delivery builders\n # Next we index delivery builders\n
print "#### Indexing 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 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 \n
# Next we index order builders\n # Next we index order builders\n
print "#### Indexing 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 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 \n
# Then we index everything except inventories\n # Then we index everything except inventories\n
for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):\n for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):\n
print "#### Indexing contents inside folder %s ####" % folder.id\n print "#### Indexing contents inside folder %s ####" % folder.id\n
if folder.getId() not in (\'inventory_module\',):\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 for o in list(folder.objectValues()):\n
try:\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 except:\n
#raise RuntimeError, o.getRelativeUrl()\n #raise RuntimeError, o.getRelativeUrl()\n
raise\n raise\n
...@@ -126,74 +126,77 @@ for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",) ...@@ -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 for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):\n
if folder.getId() in (\'inventory_module\',):\n if folder.getId() in (\'inventory_module\',):\n
print "#### Indexing contents inside folder %s ####" % folder.id\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 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 \n
# start activty from simulation because the erp5site is not an active object\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 \n
return printed\n return printed\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
<value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGUAAGQBAIQBAFoBAGQAAFMoAgAAAE5jAQAAAAsAAABhAAAA <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGQBAGQCAIQCAFoBAGQAAFMoAwAAAE5pAQAAAGMCAAAA
QwAAAHNmBgAAdAAAgwAAfQIAfAIABGQBAAJJSnQCAHQDAGQCAIMCAGQDAHwAAIMAAQF8AgAEZAQA DAAAAGwAAABDAAAAc9gGAAB0AACDAAB9AwB8AwAEZAEAAklKdAIAdAMAZAIAgwIAZAMAfAAAgwAB
AklKdAIAdAIAdAMAZAUAgwIAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhRAHQFAHQGAHQCAHQCAHQD AXwDAARkBAACSUp0AgB0AgB0AwBkBQCDAgBkBgCDAgBkBwBkCABkAwB8AABkCQB8AQCDAAMBeFcA
AGQFAIMCAGQJAIMCAIMAAIMBAIMBAERdKAB9BwB0AgB8BwBkCgCDAgBkCwBkCABkBwBkDABkAwB8 dAYAdAcAdAIAdAIAdAMAZAUAgwIAZAoAgwIAgwAAgwEAgwEARF0uAH0IAHQCAHwIAGQLAIMCAGQM
AACDAAMBcYAAV3wCAARkDQACSUp0AgB0AgB0AwBkDgCDAgBkBgCDAgBkBwBkCABkAwB8AACDAAIB AGQIAGQHAGQNAGQDAHwAAGQJAHwBAIMABAFxhgBXfAMABGQOAAJJSnQCAHQCAHQDAGQPAIMCAGQG
eGMAdAUAdAYAdAIAdAIAdAMAZA4AgwIAZAkAgwIAZAcAZAgAgwABgwEAgwEARF00AH0HAHQCAHwH AIMCAGQHAGQIAGQDAHwAAGQJAHwBAIMAAwF4aQB0BgB0BwB0AgB0AgB0AwBkDwCDAgBkCgCDAgBk
AGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQPAGQQAGQRAGQDAHwAAIMABAFxCQFXfAIABGQSAAJJSnQC BwBkCACDAAGDAQCDAQBEXToAfQgAdAIAfAgAZAsAgwIAZAwAZAgAZA0AZgIAZAcAZBAAZBEAZBIA
AHQCAHQDAGQTAIMCAGQGAIMCAGQHAGQIAGQDAHwAAIMAAgF4YAB0BQB0BgB0AgB0AgB0AwBkEwCD ZAMAfAAAZAkAfAEAgwAFAXEbAVd8AwAEZBMAAklKdAIAdAIAdAMAZBQAgwIAZAYAgwIAZAcAZAgA
AgBkCQCDAgCDAACDAQCDAQBEXTcAfQcAdAIAfAcAZAoAgwIAZAsAZAgAZAwAZA8AZgMAZAcAZBQA ZAMAfAAAZAkAfAEAgwADAXhmAHQGAHQHAHQCAHQCAHQDAGQUAIMCAGQKAIMCAIMAAIMBAIMBAERd
ZBAAZBUAZAMAfAAAgwAEAXGYAVd8AgAEZBYAAklKdAIAdAIAdAMAZBcAgwIAZAYAgwIAZAcAZAgA PQB9CAB0AgB8CABkCwCDAgBkDABkCABkDQBkEABmAwBkBwBkFQBkEQBkFgBkAwB8AABkCQB8AQCD
ZAMAfAAAgwACAXhdAHQFAHQGAHQCAHQCAHQDAGQXAIMCAGQJAIMCAIMAAIMBAIMBAERdNAB9BwB0 AAUBcbYBV3wDAARkFwACSUp0AgB0AgB0AwBkGACDAgBkBgCDAgBkBwBkCABkAwB8AABkCQB8AQCD
AgB8BwBkBgCDAgBkCwBkCABkDABmAgBkBwBkDwBkEABkEQBkAwB8AACDAAQBcSoCV3wCAARkGAAC AAMBeGMAdAYAdAcAdAIAdAIAdAMAZBgAgwIAZAoAgwIAgwAAgwEAgwEARF06AH0IAHQCAHwIAGQG
SUp0AgB0AgB0AwBkGQCDAgBkBgCDAgBkBwBkCABkAwB8AACDAAIBeF0AdAUAdAYAdAIAdAIAdAMA AIMCAGQMAGQIAGQNAGYCAGQHAGQQAGQRAGQSAGQDAHwAAGQJAHwBAIMABQFxVAJXfAMABGQZAAJJ
ZBkAgwIAZAkAgwIAgwAAgwEAgwEARF00AH0HAHQCAHwHAGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQP SnQCAHQCAHQDAGQaAIMCAGQGAIMCAGQHAGQIAGQDAHwAAGQJAHwBAIMAAwF4YwB0BgB0BwB0AgB0
AGQQAGQRAGQDAHwAAIMABAFxuQJXfAIABGQaAAJJSnQCAHQCAHQDAGQbAIMCAGQGAIMCAGQHAGQI AgB0AwBkGgCDAgBkCgCDAgCDAACDAQCDAQBEXToAfQgAdAIAfAgAZAsAgwIAZAwAZAgAZA0AZgIA
AGQDAHwAAIMAAgF4XQB0BQB0BgB0AgB0AgB0AwBkGwCDAgBkCQCDAgCDAACDAQCDAQBEXTQAfQcA ZAcAZBAAZBEAZBIAZAMAfAAAZAkAfAEAgwAFAXHvAld8AwAEZBsAAklKdAIAdAIAdAMAZBwAgwIA
dAIAfAcAZAYAgwIAZAsAZAgAZAwAZgIAZAcAZA8AZBAAZBEAZAMAfAAAgwAEAXFIA1d8AgAEZBwA ZAYAgwIAZAcAZAgAZAMAfAAAZAkAfAEAgwADAXhjAHQGAHQHAHQCAHQCAHQDAGQcAIMCAGQKAIMC
AklKdAIAdAIAdAMAZB0AgwIAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhdAHQFAHQGAHQCAHQCAHQD AIMAAIMBAIMBAERdOgB9CAB0AgB8CABkBgCDAgBkDABkCABkDQBmAgBkBwBkEABkEQBkEgBkAwB8
AGQdAIMCAGQJAIMCAIMAAIMBAIMBAERdNAB9BwB0AgB8BwBkBgCDAgBkCwBkCABkDABmAgBkBwBk AABkCQB8AQCDAAUBcYoDV3wDAARkHQACSUp0AgB0AgB0AwBkHgCDAgBkBgCDAgBkBwBkCABkAwB8
DwBkEABkEQBkAwB8AACDAAQBcdcDV3ghAXQFAHQCAHQCAHQCAHQDAGQeAIMCAGQfAIMCAIMAAGQJ AABkCQB8AQCDAAMBeGMAdAYAdAcAdAIAdAIAdAMAZB4AgwIAZAoAgwIAgwAAgwEAgwEARF06AH0I
AIMCAGQgAGYBAIMBAIMBAERd7AB9CAB8AgAEZCEAdAIAfAgAZCIAgwIAFgJJSnQCAHwIAGQjAIMC AHQCAHwIAGQGAIMCAGQMAGQIAGQNAGYCAGQHAGQQAGQRAGQSAGQDAHwAAGQJAHwBAIMABQFxJQRX
AIMAAGQkAGYBAGoHAG+zAAF0AgB8CABkBgCDAgBkBwBkCABkAwB8AACDAAIBeJQAdAUAdAYAdAIA eC0BdAYAdAIAdAIAdAIAdAMAZB8AgwIAZCAAgwIAgwAAZAoAgwIAZCEAZgEAgwEAgwEARF34AH0J
fAgAZAkAgwIAgwAAgwEAgwEARF1wAH0HAHkyAHQCAHwHAGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQP AHwDAARkIgB0AgB8CQBkIwCDAgAWAklKdAIAfAkAZCQAgwIAgwAAZCUAZgEAagcAb78AAXQCAHwJ
AGQQAGQRAGQDAHwAAIMABAFXcbcEAQEBggAAdAkAZCUAdAoAdAIAfAgAZCMAgwIAgwAAgwEAdAoA AGQGAIMCAGQHAGQIAGQDAHwAAGQJAHwBAIMAAwF4mgB0BgB0BwB0AgB8CQBkCgCDAgCDAACDAQCD
fAcAgwEAZgIAFoICAHG3BFhxtwRXcUMEAXFDBFd46AB0BQB0AgB0AgB0AgB0AwBkHgCDAgBkHwCD AQBEXXYAfQgAeTgAdAIAfAgAZAsAgwIAZAwAZAgAZA0AZgIAZAcAZBAAZBEAZBIAZAMAfAAAZAkA
AgCDAABkCQCDAgBkIABmAQCDAQCDAQBEXbMAfQgAdAIAfAgAZCMAgwIAgwAAZCQAZgEAagYAb5EA fAEAgwAFAVdxEQUBAQGCAAB0CgBkJgB0CwB0AgB8CQBkJACDAgCDAACDAQB0CwB8CACDAQBmAgAW
AXwCAARkIQB0AgB8CABkIgCDAgAWAklKdAIAfAgAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhbAHQF ggIAcREFWHERBVdxlwQBcZcEV3j0AHQGAHQCAHQCAHQCAHQDAGQfAIMCAGQgAIMCAIMAAGQKAIMC
AHQGAHQCAHwIAGQJAIMCAIMAAIMBAIMBAERdNwB9BwB0AgB8BwBkCgCDAgBkCwBkCABkDwBkDABm AGQhAGYBAIMBAIMBAERdvwB9CQB0AgB8CQBkJACDAgCDAABkJQBmAQBqBgBvnQABfAMABGQiAHQC
AwBkBwBkJgBkEABkEQBkAwB8AACDAAQBcdsFV3FnBQFxZwVXdAIAdAIAdAIAdAMAZBMAgwIAZCcA AHwJAGQjAIMCABYCSUp0AgB8CQBkBgCDAgBkBwBkCABkAwB8AABkCQB8AQCDAAMBeGEAdAYAdAcA
gwIAZAsAZCYAZBQAZgIAZBAAZBUAgwACZCgAgwIAZAMAfAAAgwABAXwCAIMAAFNkAABTKCkAAABO dAIAfAkAZAoAgwIAgwAAgwEAgwEARF09AH0IAHQCAHwIAGQLAIMCAGQMAGQIAGQQAGQNAGYDAGQH
cx8AAAAjIyMjIEluZGV4aW5nIHRyYW5zbGF0aW9ucyAjIyMjcx8AAABFUlA1U2l0ZV91cGRhdGVU AGQnAGQRAGQSAGQDAHwAAGQJAHwBAIMABQFxQQZXcccFAXHHBVd0AgB0AgB0AgB0AwBkFACDAgBk
cmFuc2xhdGlvblRhYmxlcw4AAABzcWxfY2F0YWxvZ19pZHMdAAAAIyMjIyBJbmRleGluZyBjYXRl KACDAgBkDABkJwBkFQBmAgBkEQBkFgCDAAJkKQCDAgBkAwB8AABkCQB8AQCDAAIBfAMAgwAAU2QA
Z29yaWVzICMjIyNzEQAAAHBvcnRhbF9jYXRlZ29yaWVzcw0AAAByZWluZGV4T2JqZWN0cwMAAAB0 AFMoKgAAAE5zHwAAACMjIyMgSW5kZXhpbmcgdHJhbnNsYXRpb25zICMjIyNzHwAAAEVSUDVTaXRl
YWdzBgAAAG1vZHVsZXMMAAAAb2JqZWN0VmFsdWVzcxYAAAByZWN1cnNpdmVSZWluZGV4T2JqZWN0 X3VwZGF0ZVRyYW5zbGF0aW9uVGFibGVzDgAAAHNxbF9jYXRhbG9nX2lkcx0AAAAjIyMjIEluZGV4
cwkAAABhZnRlcl90YWdzCAAAAGNhdGVnb3J5cx4AAAAjIyMjIEluZGV4aW5nIHByZWZlcmVuY2Vz aW5nIGNhdGVnb3JpZXMgIyMjI3MRAAAAcG9ydGFsX2NhdGVnb3JpZXNzDQAAAHJlaW5kZXhPYmpl
ICMjIyNzEgAAAHBvcnRhbF9wcmVmZXJlbmNlc3MIAAAAZG9jdW1lbnRzCAAAAHByaW9yaXR5aQIA Y3RzAwAAAHRhZ3MGAAAAbW9kdWxlcw4AAABwYXNzaXZlX2NvbW1pdHMMAAAAb2JqZWN0VmFsdWVz
AABzHQAAACMjIyMgSW5kZXhpbmcgc2ltdWxhdGlvbiAjIyMjcxEAAABwb3J0YWxfc2ltdWxhdGlv cxYAAAByZWN1cnNpdmVSZWluZGV4T2JqZWN0cwkAAABhZnRlcl90YWdzCAAAAGNhdGVnb3J5cx4A
bnMKAAAAc2ltdWxhdGlvbmkDAAAAcxwAAAAjIyMjIEluZGV4aW5nIHRlbXBsYXRlcyAjIyMjcxAA AAAjIyMjIEluZGV4aW5nIHByZWZlcmVuY2VzICMjIyNzEgAAAHBvcnRhbF9wcmVmZXJlbmNlc3MI
AABwb3J0YWxfdGVtcGxhdGVzcyAAAAAjIyMjIEluZGV4aW5nIGFwcGxpZWQgcnVsZXMgIyMjI3MM AAAAZG9jdW1lbnRzCAAAAHByaW9yaXR5aQIAAABzHQAAACMjIyMgSW5kZXhpbmcgc2ltdWxhdGlv
AAAAcG9ydGFsX3J1bGVzcyQAAAAjIyMjIEluZGV4aW5nIGRlbGl2ZXJ5IGJ1aWxkZXJzICMjIyNz biAjIyMjcxEAAABwb3J0YWxfc2ltdWxhdGlvbnMKAAAAc2ltdWxhdGlvbmkDAAAAcxwAAAAjIyMj
EQAAAHBvcnRhbF9kZWxpdmVyaWVzcyEAAAAjIyMjIEluZGV4aW5nIG9yZGVyIGJ1aWxkZXJzICMj IEluZGV4aW5nIHRlbXBsYXRlcyAjIyMjcxAAAABwb3J0YWxfdGVtcGxhdGVzcyAAAAAjIyMjIElu
IyNzDQAAAHBvcnRhbF9vcmRlcnNzCgAAAHBvcnRhbF91cmxzDwAAAGdldFBvcnRhbE9iamVjdHML ZGV4aW5nIGFwcGxpZWQgcnVsZXMgIyMjI3MMAAAAcG9ydGFsX3J1bGVzcyQAAAAjIyMjIEluZGV4
AAAARVJQNSBGb2xkZXJzLAAAACMjIyMgSW5kZXhpbmcgY29udGVudHMgaW5zaWRlIGZvbGRlciAl aW5nIGRlbGl2ZXJ5IGJ1aWxkZXJzICMjIyNzEQAAAHBvcnRhbF9kZWxpdmVyaWVzcyEAAAAjIyMj
cyAjIyMjcwIAAABpZHMFAAAAZ2V0SWRzEAAAAGludmVudG9yeV9tb2R1bGVzFgAAAGVycm9yOiBm IEluZGV4aW5nIG9yZGVyIGJ1aWxkZXJzICMjIyNzDQAAAHBvcnRhbF9vcmRlcnNzCgAAAHBvcnRh
b2xkZXI9JXMsIG89JXNzCQAAAGludmVudG9yeXMIAAAAYWN0aXZhdGVzIwAAAEludmVudG9yeU1v bF91cmxzDwAAAGdldFBvcnRhbE9iamVjdHMLAAAARVJQNSBGb2xkZXJzLAAAACMjIyMgSW5kZXhp
ZHVsZV9yZWluZGV4TW92ZW1lbnRMaXN0KAsAAABzBwAAAF9wcmludF9zBgAAAF9wcmludHMJAAAA bmcgY29udGVudHMgaW5zaWRlIGZvbGRlciAlcyAjIyMjcwIAAABpZHMFAAAAZ2V0SWRzEAAAAGlu
X2dldGF0dHJfcwcAAABjb250ZXh0cw4AAABzcWxfY2F0YWxvZ19pZHMJAAAAX2dldGl0ZXJfcwQA dmVudG9yeV9tb2R1bGVzFgAAAGVycm9yOiBmb2xkZXI9JXMsIG89JXNzCQAAAGludmVudG9yeXMI
AABsaXN0cwEAAABvcwYAAABmb2xkZXJzDAAAAFJ1bnRpbWVFcnJvcnMEAAAAcmVwcigLAAAAcw4A AAAAYWN0aXZhdGVzIwAAAEludmVudG9yeU1vZHVsZV9yZWluZGV4TW92ZW1lbnRMaXN0KAwAAABz
AABzcWxfY2F0YWxvZ19pZHMHAAAAX3ByaW50X3MGAAAAX3ByaW50cwkAAABfZ2V0YXR0cl9zBwAA BwAAAF9wcmludF9zBgAAAF9wcmludHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cw4AAABzcWxf
AGNvbnRleHRzCQAAAF9nZXRpdGVyX3MEAAAAbGlzdHMBAAAAb3MGAAAAZm9sZGVycwwAAABSdW50 Y2F0YWxvZ19pZHMOAAAAcGFzc2l2ZV9jb21taXRzCQAAAF9nZXRpdGVyX3MEAAAAbGlzdHMBAAAA
aW1lRXJyb3JzBAAAAHJlcHIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzEwAAAEVSUDVT b3MGAAAAZm9sZGVycwwAAABSdW50aW1lRXJyb3JzBAAAAHJlcHIoDAAAAHMOAAAAc3FsX2NhdGFs
aXRlX3JlaW5kZXhBbGwBAAAAc3IAAAAWARMCEAEfASgACQEjAhABHwEuAAkBLwMQAR8BKAAJATID b2dfaWRzDgAAAHBhc3NpdmVfY29tbWl0cwcAAABfcHJpbnRfcwYAAABfcHJpbnRzCQAAAF9nZXRh
EAEfASgACQEvAxABHwEoAAkBLwMQAR8BKAAJAS8DEAEfASgACQEvAzQABgEXAR8BGQEfAAYBBgEy dHRyX3MHAAAAY29udGV4dHMJAAAAX2dldGl0ZXJfcwQAAABsaXN0cwEAAABvcwYAAABmb2xkZXJz
AwMBOwM0AAYBHAEaARkBHwAJAUMDNAIoAgAAAHMEAAAATm9uZXMTAAAARVJQNVNpdGVfcmVpbmRl DAAAAFJ1bnRpbWVFcnJvcnMEAAAAcmVwcigAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMT
eEFsbCgCAAAAcwQAAABOb25lcxMAAABFUlA1U2l0ZV9yZWluZGV4QWxsKAAAAAAoAAAAAHMPAAAA AAAARVJQNVNpdGVfcmVpbmRleEFsbAEAAABzcgAAABYBEwIQASUBKAAJASkCEAElAS4ACQE1AxAB
U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> JQEoAAkBOAMQASUBKAAJATUDEAElASgACQE1AxABJQEoAAkBNQMQASUBKAAJATUDNAAGARcBHwEf
AR8ABgEGATgDAwE7AzQABgEcARoBHwEfAAkBSQM6AigCAAAAcwQAAABOb25lcxMAAABFUlA1U2l0
ZV9yZWluZGV4QWxsKAIAAABzBAAAAE5vbmVzEwAAAEVSUDVTaXRlX3JlaW5kZXhBbGwoAAAAACgA
AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
...@@ -201,7 +204,7 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> ...@@ -201,7 +204,7 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -221,13 +224,14 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> ...@@ -221,13 +224,14 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>1</int> </value> <value> <int>2</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>sql_catalog_id</string> <string>sql_catalog_id</string>
<string>passive_commit</string>
<string>_print_</string> <string>_print_</string>
<string>_print</string> <string>_print</string>
<string>_getattr_</string> <string>_getattr_</string>
...@@ -251,6 +255,7 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> ...@@ -251,6 +255,7 @@ U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
<value> <value>
<tuple> <tuple>
<none/> <none/>
<int>1</int>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -80,30 +80,32 @@ for o in [ x.getObject() for x in context.portal_catalog(\n ...@@ -80,30 +80,32 @@ for o in [ x.getObject() for x in context.portal_catalog(\n
o.reindexObject( after_tag = \'inventory_%i\' % count\n o.reindexObject( after_tag = \'inventory_%i\' % count\n
, tag = \'inventory_%i\' % (count+1)\n , tag = \'inventory_%i\' % (count+1)\n
, sql_catalog_id = sql_catalog_id\n , sql_catalog_id = sql_catalog_id\n
, passive_commit=passive_commit\n
)\n )\n
count += 1\n count += 1\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
<value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGUAAGQBAIQBAFoBAGQAAFMoAgAAAE5jAQAAAAsAAAAUAAAA <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGQBAGQCAIQCAFoBAGQAAFMoAwAAAE5pAQAAAGMCAAAA
SwAAAHO/AAAAZAEAfQIAeLIAdAEAZwAABGkCAH0FAHQBAHQEAHQFAGQCAIMCAGQDAGQEAGQFAGYC DAAAABYAAABLAAAAc8UAAABkAQB9AwB4uAB0AQBnAAAEaQIAfQYAdAEAdAQAdAUAZAIAgwIAZAMA
AGQGAHQGAGQHAGQIAGQJAGYCAGcBAGQKAHwAAIMABIMBAERdHAB9CQB8BQB0BAB8CQBkCwCDAgCD ZAQAZAUAZgIAZAYAdAYAZAcAZAgAZAkAZgIAZwEAZAoAfAAAgwAEgwEARF0cAH0KAHwGAHQEAHwK
AACDAQABcVMAfgUAgwEARF0+AH0KAHQEAHwKAGQMAIMCAGQNAGQOAHwCABZkDwBkDgB8AgBkAQAX AGQLAIMCAIMAAIMBAAFxUwB+BgCDAQBEXUQAfQsAdAQAfAsAZAwAgwIAZA0AZA4AfAMAFmQPAGQO
FmQKAHwAAIMAAwF8AgBkAQA3fQIAcXkAV2QAAFMoEAAAAE5pAQAAAHMOAAAAcG9ydGFsX2NhdGFs AHwDAGQBABcWZAoAfAAAZBAAfAEAgwAEAXwDAGQBADd9AwBxeQBXZAAAUygRAAAATmkBAAAAcw4A
b2dzCwAAAHBvcnRhbF90eXBlcw4AAABJbnZlbnRvcnkgQ2VsbHMOAAAASW52ZW50b3J5IExpbmVz AABwb3J0YWxfY2F0YWxvZ3MLAAAAcG9ydGFsX3R5cGVzDgAAAEludmVudG9yeSBDZWxscw4AAABJ
BQAAAGxpbWl0cwcAAABzb3J0X29ucxMAAABtb3ZlbWVudC5zdGFydF9kYXRlcwkAAABhc2NlbmRp bnZlbnRvcnkgTGluZXMFAAAAbGltaXRzBwAAAHNvcnRfb25zEwAAAG1vdmVtZW50LnN0YXJ0X2Rh
bmdzDgAAAHNxbF9jYXRhbG9nX2lkcwkAAABnZXRPYmplY3RzDQAAAHJlaW5kZXhPYmplY3RzCQAA dGVzCQAAAGFzY2VuZGluZ3MOAAAAc3FsX2NhdGFsb2dfaWRzCQAAAGdldE9iamVjdHMNAAAAcmVp
AGFmdGVyX3RhZ3MMAAAAaW52ZW50b3J5XyVpcwMAAAB0YWcoCgAAAHMFAAAAY291bnRzCQAAAF9n bmRleE9iamVjdHMJAAAAYWZ0ZXJfdGFncwwAAABpbnZlbnRvcnlfJWlzAwAAAHRhZ3MOAAAAcGFz
ZXRpdGVyX3MGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0 c2l2ZV9jb21taXQoCwAAAHMFAAAAY291bnRzCQAAAF9nZXRpdGVyX3MGAAAAYXBwZW5kcwgAAAAk
cwQAAABOb25lcw4AAABzcWxfY2F0YWxvZ19pZHMBAAAAeHMBAAAAbygLAAAAcw4AAABzcWxfY2F0 YXBwZW5kMHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwQAAABOb25lcw4AAABzcWxfY2F0YWxv
YWxvZ19pZHMCAAAAa3dzBQAAAGNvdW50cwkAAABfZ2V0aXRlcl9zBgAAAGFwcGVuZHMIAAAAJGFw Z19pZHMBAAAAeHMBAAAAb3MOAAAAcGFzc2l2ZV9jb21taXQoDAAAAHMOAAAAc3FsX2NhdGFsb2df
cGVuZDBzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMEAAAATm9uZXMBAAAAeHMBAAAAbygAAAAA aWRzDgAAAHBhc3NpdmVfY29tbWl0cwIAAABrd3MFAAAAY291bnRzCQAAAF9nZXRpdGVyX3MGAAAA
KAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3Zl YXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwQAAABOb25lcwEA
bWVudExpc3QBAAAAcxQAAAAAAQYDIgEMAQYBDwE5AxkBCwEHAigCAAAAcwQAAABOb25lcyMAAABJ AAB4cwEAAABvKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcyMAAABJbnZlbnRvcnlNb2R1
bnZlbnRvcnlNb2R1bGVfcmVpbmRleE1vdmVtZW50TGlzdCgCAAAAcwQAAABOb25lcyMAAABJbnZl bGVfcmVpbmRleE1vdmVtZW50TGlzdAEAAABzFgAAAAABBgMiAQwBBgEPATkDGQELAQYBBwIoAgAA
bnRvcnlNb2R1bGVfcmVpbmRleE1vdmVtZW50TGlzdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0 AHMEAAAATm9uZXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3ZlbWVudExpc3QoAgAAAHME
aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> AAAATm9uZXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3ZlbWVudExpc3QoAAAAACgAAAAA
cw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
...@@ -111,7 +113,7 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> ...@@ -111,7 +113,7 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -131,13 +133,14 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> ...@@ -131,13 +133,14 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>1</int> </value> <value> <int>2</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>sql_catalog_id</string> <string>sql_catalog_id</string>
<string>passive_commit</string>
<string>kw</string> <string>kw</string>
<string>count</string> <string>count</string>
<string>_getiter_</string> <string>_getiter_</string>
...@@ -161,6 +164,7 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> ...@@ -161,6 +164,7 @@ aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
<value> <value>
<tuple> <tuple>
<none/> <none/>
<int>1</int>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
</item> </item>
<item> <item>
<key> <string>display_maxwidth</string> </key> <key> <string>display_maxwidth</string> </key>
<value> <string></string> </value> <value> <int>1024</int> </value>
</item> </item>
<item> <item>
<key> <string>display_width</string> </key> <key> <string>display_width</string> </key>
......
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
</item> </item>
<item> <item>
<key> <string>display_maxwidth</string> </key> <key> <string>display_maxwidth</string> </key>
<value> <string></string> </value> <value> <int>1024</int> </value>
</item> </item>
<item> <item>
<key> <string>display_width</string> </key> <key> <string>display_width</string> </key>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
\n \n
<span tal:replace="nothing">\n <span tal:replace="nothing">\n
<!--\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 Yoshinori Okuji <yo@nexedi.com>\n
\n \n
This program is Free Software; you can redistribute it and/or\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 ...@@ -87,26 +87,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</head>\n </head>\n
\n \n
<body style="position: relative">\n <body style="position: relative">\n
\n <div metal:fill-slot="header">\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><!-- header slot -->\n </div><!-- header slot -->\n
\n \n
<div metal:fill-slot="main">\n <div metal:fill-slot="main">\n
...@@ -114,30 +95,48 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -114,30 +95,48 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<div id="content_well"\n <div id="content_well"\n
style="float: left; top: 0; width: 80%;">\n style="float: left; top: 0; width: 80%;">\n
\n \n
<div tal:condition="not: has_local">\n <span tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
\n <br/>\n
<br />\n <br/>\n
\n <br/>\n
<div metal:use-macro="util_macros/index_content" />\n <br/>\n
\n <h2 align="center" i18n:translate="" i18n:domain="ui">\n
<div metal:use-macro="util_macros/index_links" />\n Welcome to ERP5\n
\n </h2>\n
<div metal:use-macro="util_macros/index_folders" />\n <table border="1" align="center">\n
\n <tr tal:define="module_list python:here.ERP5Site_getModuleItemList();\n
</div>\n module_len python:len(module_list);\n
\n col_size python:12;\n
<div tal:condition="has_local">\n col_len python:(module_len + col_size) / col_size">\n
\n <td>\n
<div metal:use-macro="here/local_pt/macros/body | default">\n <a href="http://www.erp5.org/"><img src="images/erp5_logo.png" alt="ERP5 Logo" /></a>\n
\'local_pt\' body goes here.\n </td>\n
</div>\n <tal:block tal:repeat="col_no python:range(col_len)">\n
\n <td valign="top" class="ModuleShortcut">\n
</div>\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 \n
</div>\n </div>\n
\n \n
</div>\n </div>\n
\n \n
\n
</body>\n </body>\n
</html>\n </html>\n
...@@ -156,6 +155,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -156,6 +155,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>index_html</string> </value> <value> <string>index_html</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
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 2005-12-21 Kevin
* "Section Category" in AccountingPreferences_view is no longer required. * "Section Category" in AccountingPreferences_view is no longer required.
* Display None category in Section Category list of Preference_view form. * Display None category in Section Category list of Preference_view form.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment