Commit 0540112e authored by Vincent Bechu's avatar Vincent Bechu

Revert "[erp5_officejs] FIx erp5 configurator query"

This reverts commit 7439ab8e

/reviewed-on nexedi/erp5!717
parent 7439ab8e
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
attachment_synchro = result[1] !== "", attachment_synchro = result[1] !== "",
extended_attachment_url = result[1], extended_attachment_url = result[1],
portal_type = result[0].split(','), portal_type = result[0].split(','),
parent_relative_url = result[3].split(','),
query = '', query = '',
i, i,
// https://bugs.chromium.org/p/chromium/issues/detail?id=375297 // https://bugs.chromium.org/p/chromium/issues/detail?id=375297
...@@ -30,27 +29,30 @@ ...@@ -30,27 +29,30 @@
(navigator.userAgent.indexOf('Mobile') > 0); (navigator.userAgent.indexOf('Mobile') > 0);
for (i = 0; i < portal_type.length; i += 1) { for (i = 0; i < portal_type.length; i += 1) {
jio_query_list.push(new ComplexQuery({ jio_query_list.push(new SimpleQuery({
operator: "AND",
query_list: [new SimpleQuery({
key: "portal_type", key: "portal_type",
operator: "", operator: "",
type: "simple", type: "simple",
value: portal_type[i] value: portal_type[i]
}), new SimpleQuery({
key: "parent_relative_url",
operator: "",
type: "simple",
value: parent_relative_url[i]
})],
type: "complex"
})); }));
} }
query = Query.objectToSearchText(new ComplexQuery({ query = Query.objectToSearchText(new ComplexQuery({
operator: 'AND',
query_list: [
new ComplexQuery({
operator: "OR", operator: "OR",
query_list: jio_query_list, query_list: jio_query_list,
type: "complex" type: "complex"
}),
new SimpleQuery({
key: "parent_relative_url",
operator: "",
type: "simple",
value: result[3]
})
],
type: "complex"
})); }));
configuration = { configuration = {
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>969.16040.21382.36181</string> </value> <value> <string>969.10498.32461.42154</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1532958446.01</float> <float>1532611569.75</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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