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
a275f07f
Commit
a275f07f
authored
Jul 31, 2020
by
Romain Courteaud
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP erp5_web_renderjs_ui: allow to jump to the same context
parent
17bb3682
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
19 deletions
+28
-19
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_jump_js.js
...teItem/web_page_module/rjs_gadget_erp5_pt_form_jump_js.js
+26
-17
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_jump_js.xml
...eItem/web_page_module/rjs_gadget_erp5_pt_form_jump_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_jump_js.js
View file @
a275f07f
...
...
@@ -40,9 +40,18 @@
return
;
}
if
(
gadget
.
state
.
jio_key
===
result
.
jio_key
)
{
if
((
!
result
.
view
)
||
(
result
.
view
===
'
view
'
))
{
// Do not redirect to a specific view
// It may probably mean that there is no document to jump to
// don't update navigation history when not really redirecting
return
gadget
.
redirect
({
command
:
'
cancel_dialog_with_history
'
});
command
=
'
cancel_dialog_with_history
'
;
}
else
{
command
=
'
display_with_history
'
;
result_dict
.
jio_key
=
gadget
.
state
.
jio_key
;
result_dict
.
view
=
result
.
view
;
result_dict
.
page
=
"
jump
"
;
}
}
else
{
splitted_jio_key_list
=
result
.
jio_key
.
split
(
'
/
'
);
if
(
splitted_jio_key_list
.
length
<
2
)
{
...
...
@@ -58,7 +67,7 @@
result_dict
.
jio_key
=
result
.
jio_key
;
result_dict
.
view
=
result
.
view
;
}
}
// forced document change thus we update history
return
gadget
.
redirect
({
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_jump_js.xml
View file @
a275f07f
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
98
1.337.64021.4867
4
</string>
</value>
<value>
<string>
98
5.40438.63970.1015
4
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
15
78410060.49
</float>
<float>
15
96199151.01
</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