Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
erp5
Commits
1b087745
Commit
1b087745
authored
Jul 26, 2018
by
Vincent Bechu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_officejs] Add parent_relative_url in erp5 storage query
/reviewed-on
nexedi/erp5!714
parent
f9edce3b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
+19
-6
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js
...e_module/gadget_officejs_page_jio_erp5_configurator_js.js
+16
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.xml
..._module/gadget_officejs_page_jio_erp5_configurator_js.xml
+3
-3
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js
View file @
1b087745
...
@@ -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
"
}));
}));
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.xml
View file @
1b087745
...
@@ -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>
96
7.13533.35763.57446
</string>
</value>
<value>
<string>
96
9.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>
15
25102062.1
5
</float>
<float>
15
32611569.7
5
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment