Commit 1b087745 authored by Vincent Bechu's avatar Vincent Bechu

[erp5_officejs] Add parent_relative_url in erp5 storage query

/reviewed-on !714
parent f9edce3b
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
return RSVP.all([ return RSVP.all([
gadget.getSetting("portal_type", "Web Page"), gadget.getSetting("portal_type", "Web Page"),
gadget.getSetting("erp5_attachment_synchro", ""), gadget.getSetting("erp5_attachment_synchro", ""),
gadget.getSetting("default_view_reference", 'jio_view') gadget.getSetting("default_view_reference", 'jio_view'),
gadget.getSetting("parent_relative_url")
]); ]);
}) })
.push(function (result) { .push(function (result) {
...@@ -37,8 +38,20 @@ ...@@ -37,8 +38,20 @@
} }
query = Query.objectToSearchText(new ComplexQuery({ query = Query.objectToSearchText(new ComplexQuery({
operator: "OR", operator: 'AND',
query_list: jio_query_list, query_list: [
new ComplexQuery({
operator: "OR",
query_list: jio_query_list,
type: "complex"
}),
new SimpleQuery({
key: "parent_relative_url",
operator: "",
type: "simple",
value: result[3]
})
],
type: "complex" type: "complex"
})); }));
......
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>P0</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>967.13533.35763.57446</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>1525102062.15</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