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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
7b0a85f0
Commit
7b0a85f0
authored
Dec 01, 2020
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: disable action filter change
parent
f2b81e8f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_util_js.js
...ateItem/web_page_module/gadget_officejs_common_util_js.js
+6
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_util_js.xml
...teItem/web_page_module/gadget_officejs_common_util_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_util_js.js
View file @
7b0a85f0
...
...
@@ -9,15 +9,19 @@
"
object_web_view
"
,
"
object_jio_search
"
];
function
filterViewList
(
views_dict
,
app_view
,
default_view
)
{
console
.
warn
(
'
filterViewList
'
,
JSON
.
stringify
(
views_dict
),
JSON
.
stringify
(
app_view
),
JSON
.
stringify
(
default_view
));
// there must be only one "View" action (title = "View")
// this is for scenarios were the portal type has several "View"
// (like view, jio_view, custom_view)
// priority: app_view ; default_view ; other
return
views_dict
;
//
return views_dict;
var
only_view
,
key
,
view_list
=
Object
.
keys
(
views_dict
).
map
(
function
(
key
)
{
if
(
views_dict
[
key
].
title
===
"
View
"
)
{
return
key
;
}
});
console
.
warn
(
'
filterViewList2
'
,
JSON
.
stringify
(
view_list
));
if
(
view_list
.
includes
(
app_view
))
{
only_view
=
app_view
;
}
else
if
(
view_list
.
includes
(
default_view
))
{
...
...
@@ -30,6 +34,7 @@
delete
views_dict
[
view_list
[
key
]];
}
}
console
.
warn
(
'
filterViewList3
'
,
JSON
.
stringify
(
views_dict
));
return
views_dict
;
}
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_util_js.xml
View file @
7b0a85f0
...
...
@@ -275,7 +275,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
988.
10966.984.65433
</string>
</value>
<value>
<string>
988.
23680.9260.46796
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -293,7 +293,7 @@
</tuple>
<state>
<tuple>
<float>
1606
140846.1
</float>
<float>
1606
817358.88
</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