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
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
Léo-Paul Géneau
erp5
Commits
b21eb2a7
Commit
b21eb2a7
authored
Mar 12, 2020
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: allow module to be part of the navigation history
parent
d870d278
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.js
...TemplateItem/web_page_module/rjs_gadget_erp5_global_js.js
+1
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_global_js.xml
+2
-2
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
+3
-1
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
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListFrontLink.zpt
...enderjs_ui_page_templates_zuite/testFormListFrontLink.zpt
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.js
View file @
b21eb2a7
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
page
:
"
action
"
,
page
:
"
action
"
,
view
:
view
view
:
view
}},
}},
{
command
:
'
display
'
,
options
:
{}
},
{
command
:
'
history_previous
'
},
{
command
:
'
display_dialog_with_history
'
,
options
:
{
{
command
:
'
display_dialog_with_history
'
,
options
:
{
jio_key
:
jio_key
,
jio_key
:
jio_key
,
page
:
"
export
"
,
page
:
"
export
"
,
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.xml
View file @
b21eb2a7
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
79.58035.58376.38417
</string>
</value>
<value>
<string>
9
80.25643.17614.37256
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
74157261.21
</float>
<float>
15
84026863.34
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
b21eb2a7
...
@@ -645,13 +645,15 @@
...
@@ -645,13 +645,15 @@
var
parent_link
=
erp5_document
.
_links
.
parent
,
var
parent_link
=
erp5_document
.
_links
.
parent
,
uri
,
uri
,
options
=
{};
options
=
{};
copyStickyParameterDict
(
previous_options
,
options
);
if
(
parent_link
!==
undefined
)
{
if
(
parent_link
!==
undefined
)
{
uri
=
new
URI
(
parent_link
.
href
);
uri
=
new
URI
(
parent_link
.
href
);
copyStickyParameterDict
(
previous_options
,
options
);
options
.
jio_key
=
uri
.
segment
(
2
);
options
.
jio_key
=
uri
.
segment
(
2
);
// When redirecting to parent, always try to restore the state
// When redirecting to parent, always try to restore the state
return
execDisplayStoredStateCommand
(
gadget
,
options
);
return
execDisplayStoredStateCommand
(
gadget
,
options
);
}
}
// If no parent, return to the home page
return
gadget
.
redirect
({
command
:
'
display
'
,
options
:
options
});
},
function
(
error
)
{
},
function
(
error
)
{
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
(
error
.
status_code
===
404
))
{
(
error
.
status_code
===
404
))
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
b21eb2a7
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
98
1.4330.60289.19831
</string>
</value>
<value>
<string>
98
2.31305.20902.62242
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
78649655.03
</float>
<float>
15
84027522.41
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListFrontLink.zpt
View file @
b21eb2a7
...
@@ -34,12 +34,12 @@
...
@@ -34,12 +34,12 @@
<!-- Header has a link to the front page -->
<!-- Header has a link to the front page -->
<tr>
<tr>
<td>
assertElementPresent
</td>
<td>
assertElementPresent
</td>
<td>
//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!
display
')]
</td>
<td>
//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!
history_previous
')]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!
display
')]
</td>
<td>
//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!
history_previous
')]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
...
...
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