Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
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
Hamza
erp5-Boxiang
Commits
e32deab9
Commit
e32deab9
authored
Jan 02, 2019
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: Fix execDisplayERP5ActionCommand of erp5_router
so that options are kept
parent
bddcb668
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
...TemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
+7
-5
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
+3
-3
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
e32deab9
...
...
@@ -382,7 +382,7 @@
function
execDisplayERP5ActionCommand
(
gadget
,
options
)
{
return
gadget
.
jio_getAttachment
(
options
.
jio_key
,
'
links
'
)
.
push
(
function
(
document_view
)
{
var
action
,
action_data
,
action_url
,
i
,
j
;
var
action
,
action_data
,
action_url
,
i
,
j
,
new_options
;
for
(
i
=
0
;
i
<
Object
.
keys
(
document_view
.
_links
).
length
;
i
=
i
+
1
)
{
action
=
Object
.
keys
(
document_view
.
_links
)[
i
];
...
...
@@ -393,12 +393,14 @@
for
(
j
=
0
;
j
<
document_view
.
_links
[
action
].
length
;
j
=
j
+
1
)
{
action_data
=
document_view
.
_links
[
action
][
j
];
if
(
action_data
.
name
===
options
.
page
)
{
new_options
=
{
jio_key
:
options
.
jio_key
,
view
:
action_data
.
href
};
copyStickyParameterDict
(
options
,
new_options
);
action_url
=
getDisplayUrlFor
(
options
.
jio_key
,
{
jio_key
:
options
.
jio_key
,
view
:
action_data
.
href
}
new_options
);
return
synchronousChangeState
(
action_url
);
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
e32deab9
...
...
@@ -218,7 +218,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zop
e
</string>
</value>
<value>
<string>
superGeorg
e
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -232,7 +232,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
1.58160.33555.10956
</string>
</value>
<value>
<string>
97
2.46882.63089.27869
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -250,7 +250,7 @@
</tuple>
<state>
<tuple>
<float>
154
3249005.07
</float>
<float>
154
6418134.48
</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