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>
......
...@@ -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