Commit 2c9f1dbe authored by Gabriel Monnerat's avatar Gabriel Monnerat

erp5_web_renderjs_ui: support complex queries in sub queries

parent 27d7aa2f
...@@ -178,12 +178,21 @@ ...@@ -178,12 +178,21 @@
query = Query.parseStringToObject(extended_search); query = Query.parseStringToObject(extended_search);
if (query.type === "complex") { if (query.type === "complex") {
for (i = 0; i < query.query_list.length; i += 1) { for (i = 0; i < query.query_list.length; i += 1) {
if (query.query_list[i].key.indexOf("selection_domain_") === 0) { if (query.query_list.hasOwnProperty(i)) {
if (
query.query_list[i].key &&
query.query_list[i].key.indexOf("selection_domain_") === 0
) {
extended_search_domain_list.push(query.query_list[i]); extended_search_domain_list.push(query.query_list[i]);
} else {
if (query.query_list[i].type === "complex") {
jio_query_list.push(new ComplexQuery(query.query_list[i]));
} else { } else {
jio_query_list.push(new SimpleQuery(query.query_list[i])); jio_query_list.push(new SimpleQuery(query.query_list[i]));
} }
} }
}
}
} else { } else {
jio_query_list.push(new SimpleQuery(query)); jio_query_list.push(new SimpleQuery(query));
} }
......
...@@ -140,6 +140,12 @@ ...@@ -140,6 +140,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -205,4 +211,69 @@ ...@@ -205,4 +211,69 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_log</string> </key>
<value>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1007.6054.5919.58094</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="_reconstructor" module="copy_reg"/>
</klass>
<tuple>
<global name="DateTime" module="DateTime.DateTime"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state>
<tuple>
<float>1679002058.79</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
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