Commit d8a39266 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

modify builder's select methods to support both new and old simulation hierarchy.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32569 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 14c19765
...@@ -53,10 +53,17 @@ ...@@ -53,10 +53,17 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>kw[\'parent_specialise_portal_type\'] = [\'Order Rule\', \'Delivery Rule\']\n <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery\n
kw[\'explanation_portal_type\'] = \'Task\'\n \n
kw[\'portal_type\'] = \'Simulation Movement\'\n kw[\'query\'] = ComplexQuery(\n
kw[\'simulation_state\'] = \'confirmed\'\n Query(portal_type=\'Simulation Movement\', explanation_portal_type=\'Task\'),\n
ComplexQuery(\n
Query(parent_specialise_portal_type=[\'Order Rule\', \'Delivery Rule\'],\n
simulation_state=\'confirmed\'),\n
Query(parent_specialise_portal_type=\'Delivering Simulation Rule\',\n
grand_parent_simulation_state=\'confirmed\'),\n
operator=\'or\'),\n
operator=\'and\')\n
\n \n
kw.update(context.portal_catalog.buildSQLQuery(**kw))\n kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
\n \n
...@@ -111,6 +118,9 @@ else:\n ...@@ -111,6 +118,9 @@ else:\n
<tuple> <tuple>
<string>src__</string> <string>src__</string>
<string>kw</string> <string>kw</string>
<string>Products.ZSQLCatalog.SQLCatalog</string>
<string>Query</string>
<string>ComplexQuery</string>
<string>_write_</string> <string>_write_</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>_apply_</string> <string>_apply_</string>
...@@ -140,6 +150,10 @@ else:\n ...@@ -140,6 +150,10 @@ else:\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Task_selectMovement</string> </value> <value> <string>Task_selectMovement</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
<value> <value>
......
729 730
\ No newline at end of file \ No newline at end of file
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