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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
erp5
Commits
0540112e
Commit
0540112e
authored
Jul 31, 2018
by
Vincent Bechu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[erp5_officejs] FIx erp5 configurator query"
This reverts commit
7439ab8e
/reviewed-on
!717
parent
7439ab8e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
19 deletions
+21
-19
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
+19
-17
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.xml
..._module/gadget_officejs_page_jio_erp5_configurator_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js
View file @
0540112e
...
...
@@ -20,7 +20,6 @@
attachment_synchro
=
result
[
1
]
!==
""
,
extended_attachment_url
=
result
[
1
],
portal_type
=
result
[
0
].
split
(
'
,
'
),
parent_relative_url
=
result
[
3
].
split
(
'
,
'
),
query
=
''
,
i
,
// https://bugs.chromium.org/p/chromium/issues/detail?id=375297
...
...
@@ -30,27 +29,30 @@
(
navigator
.
userAgent
.
indexOf
(
'
Mobile
'
)
>
0
);
for
(
i
=
0
;
i
<
portal_type
.
length
;
i
+=
1
)
{
jio_query_list
.
push
(
new
ComplexQuery
({
operator
:
"
AND
"
,
query_list
:
[
new
SimpleQuery
({
jio_query_list
.
push
(
new
SimpleQuery
({
key
:
"
portal_type
"
,
operator
:
""
,
type
:
"
simple
"
,
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
({
operator
:
'
AND
'
,
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
"
}));
configuration
=
{
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.xml
View file @
0540112e
...
...
@@ -273,7 +273,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
969.1
6040.21382.36181
</string>
</value>
<value>
<string>
969.1
0498.32461.42154
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -291,7 +291,7 @@
</tuple>
<state>
<tuple>
<float>
1532
958446.01
</float>
<float>
1532
611569.75
</float>
<string>
UTC
</string>
</tuple>
</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