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
1
Merge Requests
1
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
Cédric Le Ninivin
erp5
Commits
55b38cc4
Commit
55b38cc4
authored
Sep 04, 2019
by
Valentin Benozillo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: Display in action button: action_title if setup, otherwise title form
parent
bcae45dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+1
-0
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.js
...Item/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.js
+6
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
...tem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
+3
-3
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
55b38cc4
...
@@ -1154,6 +1154,7 @@ def renderFormDefinition(form, response_dict):
...
@@ -1154,6 +1154,7 @@ def renderFormDefinition(form, response_dict):
response_dict
[
"title"
]
=
Base_translateString
(
form
.
getTitle
())
response_dict
[
"title"
]
=
Base_translateString
(
form
.
getTitle
())
response_dict
[
"pt"
]
=
form
.
pt
response_dict
[
"pt"
]
=
form
.
pt
response_dict
[
"action"
]
=
form
.
action
response_dict
[
"action"
]
=
form
.
action
response_dict
[
"action_title"
]
=
Base_translateString
(
form
.
action_title
)
response_dict
[
"update_action"
]
=
form
.
update_action
response_dict
[
"update_action"
]
=
form
.
update_action
response_dict
[
"update_action_title"
]
=
Base_translateString
(
form
.
update_action_title
)
response_dict
[
"update_action_title"
]
=
Base_translateString
(
form
.
update_action_title
)
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.js
View file @
55b38cc4
...
@@ -174,6 +174,7 @@
...
@@ -174,6 +174,7 @@
form_definition
:
options
.
form_definition
,
form_definition
:
options
.
form_definition
,
erp5_form
:
options
.
erp5_form
||
{},
erp5_form
:
options
.
erp5_form
||
{},
// editable: true, // ignore global editable state (be always editable)
// editable: true, // ignore global editable state (be always editable)
action_title
:
options
.
form_definition
.
action_title
,
has_update_action
:
Boolean
(
options
.
form_definition
.
update_action
),
has_update_action
:
Boolean
(
options
.
form_definition
.
update_action
),
update_action_title
:
options
.
form_definition
.
update_action_title
,
update_action_title
:
options
.
form_definition
.
update_action_title
,
// pass extended_search from previous view in case any gadget is curious
// pass extended_search from previous view in case any gadget is curious
...
@@ -254,7 +255,11 @@
...
@@ -254,7 +255,11 @@
]);
]);
})
})
.
push
(
function
(
translated_title_list
)
{
.
push
(
function
(
translated_title_list
)
{
form_gadget
.
element
.
querySelector
(
'
input.dialogconfirm
'
).
value
=
translated_title_list
[
1
];
var
action_confirm
=
form_gadget
.
element
.
querySelector
(
'
input.dialogconfirm
'
)
if
(
form_gadget
.
state
.
action_title
)
action_confirm
.
value
=
form_gadget
.
state
.
action_title
;
else
action_confirm
.
value
=
translated_title_list
[
1
];
selector
.
textContent
=
"
\
u00A0
"
+
translated_title_list
[
0
];
selector
.
textContent
=
"
\
u00A0
"
+
translated_title_list
[
0
];
selector
.
className
=
"
ui-content-title ui-body-c ui-icon ui-icon-custom
"
+
icon
;
selector
.
className
=
"
ui-content-title ui-body-c ui-icon ui-icon-custom
"
+
icon
;
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
View file @
55b38cc4
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
georgios.dagkakis
</string>
</value>
<value>
<string>
valentin
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -222,7 +222,7 @@
...
@@ -222,7 +222,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
6.52803.20172.15991
</string>
</value>
<value>
<string>
97
8.13676.64074.1365
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -240,7 +240,7 @@
...
@@ -240,7 +240,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
156
2070551.41
</float>
<float>
156
7589301.19
</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