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
Laurent S
erp5
Commits
6aec6101
Commit
6aec6101
authored
Oct 30, 2017
by
Tomáš Peterka
Committed by
Tomáš Peterka
Oct 30, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[renderjs_ui] Action/Export links do not mingle with editability
/reviewed-on
nexedi/erp5!472
parent
4c7afb33
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
13 deletions
+11
-13
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
+4
-5
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
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_export_js.js
...ateItem/web_page_module/rjs_gadget_erp5_page_export_js.js
+3
-4
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_export_js.xml
...teItem/web_page_module/rjs_gadget_erp5_page_export_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 @
6aec6101
...
...
@@ -18,7 +18,7 @@
* @param {string} icon - alias used in font-awesome iconset
* @param {Array} command_list - array of links obtained from ERP5 HATEOAS
*/
function
renderLinkList
(
gadget
,
title
,
icon
,
erp5_link_list
,
editable
)
{
function
renderLinkList
(
gadget
,
title
,
icon
,
erp5_link_list
)
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
// obtain RJS links from ERP5 links
...
...
@@ -28,8 +28,7 @@
"
command
"
:
'
change
'
,
"
options
"
:
{
"
view
"
:
erp5_link
.
href
,
"
page
"
:
undefined
,
"
editable
"
:
editable
"
page
"
:
undefined
}
});
})
...
...
@@ -86,8 +85,8 @@
.
concat
(
asArray
(
erp5_document
.
_links
.
action_object_clone_action
));
return
RSVP
.
all
([
renderLinkList
(
gadget
,
"
Actions
"
,
"
gear
"
,
action_list
,
options
.
editable
),
renderLinkList
(
gadget
,
"
Workflow-Transitions
"
,
"
random
"
,
transition_list
,
true
)
renderLinkList
(
gadget
,
"
Actions
"
,
"
gear
"
,
action_list
),
renderLinkList
(
gadget
,
"
Workflow-Transitions
"
,
"
random
"
,
transition_list
)
]);
})
.
push
(
function
(
translated_html_link_list
)
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.xml
View file @
6aec6101
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
2.47066.3849.6894
</string>
</value>
<value>
<string>
96
3.3161.27188.50653
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
150
7798684.39
</float>
<float>
150
9097440.1
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_export_js.js
View file @
6aec6101
...
...
@@ -18,7 +18,7 @@
* @param {string} icon - alias used in font-awesome iconset
* @param {Array} command_list - array of links obtained from ERP5 HATEOAS
*/
function
renderLinkList
(
gadget
,
title
,
icon
,
erp5_link_list
,
editable
)
{
function
renderLinkList
(
gadget
,
title
,
icon
,
erp5_link_list
)
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
// obtain RJS links from ERP5 links
...
...
@@ -28,8 +28,7 @@
"
command
"
:
'
change
'
,
"
options
"
:
{
"
view
"
:
erp5_link
.
href
,
"
page
"
:
undefined
,
"
editable
"
:
editable
"
page
"
:
undefined
}
});
})
...
...
@@ -84,7 +83,7 @@
.
concat
(
asArray
(
erp5_document
.
_links
.
action_object_jio_report
));
return
RSVP
.
all
([
renderLinkList
(
gadget
,
"
Reports
"
,
"
bar-chart-o
"
,
report_list
,
true
)
renderLinkList
(
gadget
,
"
Reports
"
,
"
bar-chart-o
"
,
report_list
)
]);
})
.
push
(
function
(
translated_html_link_list
)
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_export_js.xml
View file @
6aec6101
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
2.12738.3608.48128
</string>
</value>
<value>
<string>
96
3.3162.7999.42854
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
150
7129748.45
</float>
<float>
150
9097420.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