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
140
Merge Requests
140
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
2419299d
Commit
2419299d
authored
Jan 11, 2021
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: fix history previous in case of no history and no jio_key
parent
54a73770
Pipeline
#13077
failed with stage
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
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
+10
-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
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
2419299d
...
...
@@ -649,6 +649,12 @@
});
}
function
redirectToHomePage
(
gadget
,
previous_options
)
{
var
options
=
{};
copyStickyParameterDict
(
previous_options
,
options
);
return
gadget
.
redirect
({
command
:
'
display
'
,
options
:
options
});
}
function
redirectToParent
(
gadget
,
jio_key
,
previous_options
)
{
return
gadget
.
jio_getAttachment
(
jio_key
,
"
links
"
)
.
push
(
function
(
erp5_document
)
{
...
...
@@ -667,9 +673,7 @@
},
function
(
error
)
{
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
(
error
.
status_code
===
404
))
{
var
options
=
{};
copyStickyParameterDict
(
previous_options
,
options
);
return
gadget
.
redirect
({
command
:
'
display
'
,
options
:
options
});
return
redirectToHomePage
(
gadget
,
previous_options
);
}
throw
error
;
});
...
...
@@ -683,9 +687,10 @@
queue
=
new
RSVP
.
Queue
(),
previous_id
;
if
(
history
===
undefined
)
{
if
(
jio_key
!
==
undefined
)
{
return
redirectTo
Parent
(
gadget
,
jio_key
,
previous_options
);
if
(
jio_key
=
==
undefined
)
{
return
redirectTo
HomePage
(
gadget
,
previous_options
);
}
return
redirectToParent
(
gadget
,
jio_key
,
previous_options
);
}
// XXX XXX XXX
if
(
previous_options
.
back_field
)
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
2419299d
...
...
@@ -236,7 +236,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
989.1713
3.23517.28876
</string>
</value>
<value>
<string>
989.1713
9.27691.33245
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>
1610357
005.28
</float>
<float>
1610357
319.16
</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