Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Jérome Perrin
slapos.core
Commits
34ce56e9
Commit
34ce56e9
authored
Jun 23, 2023
by
Rafael Monnerat
👻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Failover to key if title isnt defined (parameter editor)
parent
165542b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_json_form_js.js
...web_page_module/rjs_gadget_erp5_page_slap_json_form_js.js
+7
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_json_form_js.xml
...eb_page_module/rjs_gadget_erp5_page_slap_json_form_js.xml
+2
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_json_form_js.js
View file @
34ce56e9
...
...
@@ -326,9 +326,13 @@
for
(
key
in
json_field
.
properties
)
{
if
(
json_field
.
properties
.
hasOwnProperty
(
key
))
{
if
(
editable
||
default_dict
[
key
]
!==
undefined
)
{
label
=
domsugar
(
"
label
"
,
{
'
text
'
:
json_field
.
properties
[
key
].
title
});
if
(
json_field
.
properties
[
key
].
title
!==
undefined
)
{
label
=
domsugar
(
"
label
"
,
{
'
text
'
:
json_field
.
properties
[
key
].
title
});
}
else
{
label
=
domsugar
(
"
label
"
,
{
'
text
'
:
key
});
}
is_required
=
false
;
if
((
Array
.
isArray
(
json_field
.
required
))
&&
(
json_field
.
required
.
includes
(
key
)))
{
is_required
=
true
;
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_json_form_js.xml
View file @
34ce56e9
...
...
@@ -282,7 +282,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
1008.4
4146.47863.60757
</string>
</value>
<value>
<string>
1008.4
8224.2250.61030
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -302,7 +302,7 @@
</tuple>
<state>
<tuple>
<float>
168
5377921.8
5
</float>
<float>
168
7544274.
5
</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