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
Georgios Dagkakis
erp5
Commits
3e2a73df
Commit
3e2a73df
authored
Oct 31, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Form list: use getUrlForList
parent
90e26225
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
22 deletions
+26
-22
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js
...teItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js
+24
-20
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
...eItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js
View file @
3e2a73df
...
...
@@ -8,7 +8,7 @@
// Acquired methods
/////////////////////////////////////////////////////////////////
.
declareAcquiredMethod
(
"
updateHeader
"
,
"
updateHeader
"
)
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareAcquiredMethod
(
"
getUrlFor
List
"
,
"
getUrlForList
"
)
.
declareAcquiredMethod
(
"
redirect
"
,
"
redirect
"
)
.
declareAcquiredMethod
(
"
getUrlParameter
"
,
"
getUrlParameter
"
)
.
declareAcquiredMethod
(
"
renderEditorPanel
"
,
"
renderEditorPanel
"
)
...
...
@@ -89,36 +89,40 @@
// render the header
.
push
(
function
()
{
var
new_content_action
=
form_gadget
.
state
.
erp5_document
.
_links
.
action_object_new_content_action
;
var
new_content_action
=
form_gadget
.
state
.
erp5_document
.
_links
.
action_object_new_content_action
,
url_for_parameter_list
=
[
{
command
:
'
change
'
,
options
:
{
page
:
"
action
"
}},
{
command
:
'
display
'
,
options
:
{}},
{
command
:
'
change
'
,
options
:
{
page
:
"
export
"
}}
];
if
(
new_content_action
!==
undefined
)
{
new_content_action
=
form_gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
view
:
new_content_action
.
href
,
editable
:
true
}});
}
else
{
new_content_action
=
""
;
url_for_parameter_list
.
push
({
command
:
'
change
'
,
options
:
{
view
:
new_content_action
.
href
,
editable
:
true
}});
}
return
RSVP
.
all
([
new_content_action
,
form_gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
action
"
}}),
form_gadget
.
getUrlFor
({
command
:
'
display
'
,
options
:
{}}),
(
form_gadget
.
state
.
erp5_document
.
_links
.
action_object_jio_report
||
form_gadget
.
state
.
erp5_document
.
_links
.
action_object_jio_print
||
form_gadget
.
state
.
erp5_document
.
_links
.
action_object_jio_exchange
)
?
form_gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
export
"
}})
:
""
,
calculatePageTitle
(
form_gadget
,
form_gadget
.
state
.
erp5_document
)
calculatePageTitle
(
form_gadget
,
form_gadget
.
state
.
erp5_document
),
form_gadget
.
getUrlForList
(
url_for_parameter_list
)
]);
})
.
push
(
function
(
all_gadget
)
{
.
push
(
function
(
result_list
)
{
var
url_list
=
result_list
[
1
];
return
form_gadget
.
updateHeader
({
panel_action
:
true
,
jump_url
:
""
,
fast_input_url
:
""
,
add_url
:
all_gadget
[
0
],
actions_url
:
all_gadget
[
1
],
export_url
:
all_gadget
[
3
],
page_title
:
all_gadget
[
4
],
front_url
:
all_gadget
[
2
],
add_url
:
url_list
[
3
]
||
''
,
actions_url
:
url_list
[
0
],
export_url
:
(
form_gadget
.
state
.
erp5_document
.
_links
.
action_object_jio_report
||
form_gadget
.
state
.
erp5_document
.
_links
.
action_object_jio_print
||
form_gadget
.
state
.
erp5_document
.
_links
.
action_object_jio_exchange
)
?
url_list
[
2
]
:
''
,
page_title
:
result_list
[
0
],
front_url
:
url_list
[
1
],
filter_action
:
true
});
});
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
View file @
3e2a73df
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
66.8130.3423.18312
</string>
</value>
<value>
<string>
9
71.20638.49773.13568
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15
26654620.37
</float>
<float>
15
40997693.31
</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