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
Léo-Paul Géneau
slapos.core
Commits
affb6f3b
Commit
affb6f3b
authored
Mar 23, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Fix rendering form for Slave/Shared cases.
parent
eab0f1d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js
...age_module/rjs_gadget_erp5_page_slap_parameter_form_js.js
+9
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml
...ge_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml
+2
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js
View file @
affb6f3b
...
@@ -295,7 +295,7 @@
...
@@ -295,7 +295,7 @@
input
.
name
=
path
+
"
/
"
+
key
;
input
.
name
=
path
+
"
/
"
+
key
;
input
.
setAttribute
(
"
class
"
,
"
slapos-parameter
"
);
input
.
setAttribute
(
"
class
"
,
"
slapos-parameter
"
);
div_input
.
appendChild
(
input
);
div_input
.
appendChild
(
input
);
default_used_list
.
push
(
key
);
default_used_list
.
push
(
key
);
span_info
=
document
.
createElement
(
"
span
"
);
span_info
=
document
.
createElement
(
"
span
"
);
span_info
.
textContent
=
'
(Not part of the schema)
'
;
span_info
.
textContent
=
'
(Not part of the schema)
'
;
...
@@ -700,8 +700,8 @@
...
@@ -700,8 +700,8 @@
option
[
'
data-shared
'
]
=
json
[
'
software-type
'
][
option_index
].
shared
;
option
[
'
data-shared
'
]
=
json
[
'
software-type
'
][
option_index
].
shared
;
if
((
option
_index
===
option_selected
)
&&
if
((
option
.
value
===
option_selected
)
&&
(
options
.
value
.
parameter
.
shared
==
=
json
[
'
software-type
'
][
option_index
].
shared
))
{
(
options
.
value
.
parameter
.
shared
==
json
[
'
software-type
'
][
option_index
].
shared
))
{
option
.
selected
=
"
selected
"
;
option
.
selected
=
"
selected
"
;
if
(
json
[
'
software-type
'
][
option_index
].
shared
===
true
)
{
if
(
json
[
'
software-type
'
][
option_index
].
shared
===
true
)
{
parameter_shared
.
value
=
true
;
parameter_shared
.
value
=
true
;
...
@@ -712,7 +712,7 @@
...
@@ -712,7 +712,7 @@
if
(
restricted_softwaretype
===
true
)
{
if
(
restricted_softwaretype
===
true
)
{
if
(
option
.
value
===
options
.
value
.
parameter
.
softwaretype
)
{
if
(
option
.
value
===
options
.
value
.
parameter
.
softwaretype
)
{
if
(
options
.
value
.
parameter
.
shared
==
=
json
[
'
software-type
'
][
option_index
].
shared
)
{
if
(
options
.
value
.
parameter
.
shared
==
json
[
'
software-type
'
][
option_index
].
shared
)
{
input
.
appendChild
(
option
);
input
.
appendChild
(
option
);
}
}
}
}
...
@@ -920,10 +920,14 @@
...
@@ -920,10 +920,14 @@
return
gadget
.
getElement
()
return
gadget
.
getElement
()
.
push
(
function
(
element
)
{
.
push
(
function
(
element
)
{
var
text_content
=
element
.
querySelector
(
'
textarea[name=text_content]
'
),
var
text_content
=
element
.
querySelector
(
'
textarea[name=text_content]
'
),
software_type
=
element
.
querySelector
(
'
select[name=software_type]
'
);
software_type
=
element
.
querySelector
(
'
select[name=software_type]
'
),
shared
=
element
.
querySelector
(
'
input[name=shared]
'
);
if
(
software_type
!==
null
)
{
if
(
software_type
!==
null
)
{
content_dict
.
software_type
=
software_type
.
value
;
content_dict
.
software_type
=
software_type
.
value
;
}
}
if
((
shared
!==
null
)
&&
(
shared
.
value
===
"
true
"
))
{
content_dict
.
shared
=
1
;
}
if
(
text_content
!==
null
)
{
if
(
text_content
!==
null
)
{
return
text_content
.
value
;
return
text_content
.
value
;
}
}
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml
View file @
affb6f3b
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
5.52522.13952.27733
</string>
</value>
<value>
<string>
96
6.24439.33534.42308
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
19836241.61
</float>
<float>
15
21824575.6
</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