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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
erp5
Commits
701dc548
Commit
701dc548
authored
Mar 29, 2017
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Store navigation parameter when displaying the history page
parent
710bab7c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
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
+12
-9
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 @
701dc548
...
@@ -570,7 +570,18 @@
...
@@ -570,7 +570,18 @@
})
})
);
);
}
}
}
else
if
(
command_options
.
args
.
page
===
'
history
'
)
{
}
if
(
command_options
.
args
.
page
===
undefined
)
{
return
routeMethodLess
(
gadget
);
}
command_options
.
args
.
jio_key
=
command_options
.
path
||
undefined
;
// Store current options to handle navigation
gadget
.
props
.
options
=
JSON
.
parse
(
JSON
.
stringify
(
command_options
.
args
));
if
(
command_options
.
args
.
page
===
'
history
'
)
{
// This is an adhoc route to handle local navigation history
// This is an adhoc route to handle local navigation history
return
gadget
.
props
.
jio_navigation_gadget
.
allDocs
({
return
gadget
.
props
.
jio_navigation_gadget
.
allDocs
({
sort_on
:
[[
'
access_time
'
,
'
descending
'
]]
sort_on
:
[[
'
access_time
'
,
'
descending
'
]]
...
@@ -594,14 +605,6 @@
...
@@ -594,14 +605,6 @@
});
});
}
}
if
(
command_options
.
args
.
page
===
undefined
)
{
return
routeMethodLess
(
gadget
);
}
command_options
.
args
.
jio_key
=
command_options
.
path
||
undefined
;
// Store current options to handle navigation
gadget
.
props
.
options
=
JSON
.
parse
(
JSON
.
stringify
(
command_options
.
args
));
if
(
gadget
.
props
.
form_content
)
{
if
(
gadget
.
props
.
form_content
)
{
command_options
.
args
.
form_content
=
gadget
.
props
.
form_content
;
command_options
.
args
.
form_content
=
gadget
.
props
.
form_content
;
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
701dc548
...
@@ -232,7 +232,7 @@
...
@@ -232,7 +232,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
6.24559.34655.7219
</string>
</value>
<value>
<string>
95
8.21184.3295.34167
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
83374652.65
</float>
<float>
14
90776558.07
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</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