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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
erp5
Commits
cf26c8fd
Commit
cf26c8fd
authored
Jan 03, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] HAL style does not return templated URL for action
See
nexedi/erp5@9dcbc756
parent
707058d7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.js
...ateItem/web_page_module/rjs_gadget_erp5_page_action_js.js
+6
-7
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.xml
...teItem/web_page_module/rjs_gadget_erp5_page_action_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.js
View file @
cf26c8fd
/*global window, rJS, RSVP, Handlebars,
UriTemplate,
calculatePageTitle, ensureArray */
/*global window, rJS, RSVP, Handlebars, calculatePageTitle, ensureArray */
/*jslint nomen: true, indent: 2, maxerr: 3 */
/*jslint nomen: true, indent: 2, maxerr: 3 */
(
function
(
window
,
rJS
,
RSVP
,
Handlebars
,
UriTemplate
,
calculatePageTitle
,
ensureArray
)
{
(
function
(
window
,
rJS
,
RSVP
,
Handlebars
,
calculatePageTitle
,
ensureArray
)
{
"
use strict
"
;
"
use strict
"
;
/////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
...
@@ -19,15 +19,14 @@
...
@@ -19,15 +19,14 @@
* @param {Array} command_list - array of links obtained from ERP5 HATEOAS
* @param {Array} command_list - array of links obtained from ERP5 HATEOAS
*/
*/
function
renderLinkList
(
gadget
,
title
,
icon
,
erp5_link_list
)
{
function
renderLinkList
(
gadget
,
title
,
icon
,
erp5_link_list
)
{
return
gadget
.
getUrlParameter
(
"
extended_search
"
)
return
new
RSVP
.
Queue
()
.
push
(
function
(
query
)
{
.
push
(
function
()
{
// obtain RJS links from ERP5 links
return
RSVP
.
all
(
return
RSVP
.
all
(
erp5_link_list
.
map
(
function
(
erp5_link
)
{
erp5_link_list
.
map
(
function
(
erp5_link
)
{
return
gadget
.
getUrlFor
({
return
gadget
.
getUrlFor
({
"
command
"
:
'
change
'
,
"
command
"
:
'
change
'
,
"
options
"
:
{
"
options
"
:
{
"
view
"
:
UriTemplate
.
parse
(
erp5_link
.
href
).
expand
({
query
:
query
})
,
"
view
"
:
erp5_link
.
href
,
"
page
"
:
undefined
"
page
"
:
undefined
}
}
});
});
...
@@ -109,4 +108,4 @@
...
@@ -109,4 +108,4 @@
return
;
return
;
});
});
}(
window
,
rJS
,
RSVP
,
Handlebars
,
UriTemplate
,
calculatePageTitle
,
ensureArray
));
}(
window
,
rJS
,
RSVP
,
Handlebars
,
calculatePageTitle
,
ensureArray
));
\ No newline at end of file
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.xml
View file @
cf26c8fd
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
0.5224.10569.36898
</string>
</value>
<value>
<string>
97
2.48331.62264.17646
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
36227065.3
</float>
<float>
15
46505106.65
</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