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
f878bc64
Commit
f878bc64
authored
Feb 28, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Include software_type on the getContent of the parameter form.
parent
0ee93f11
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
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
-3
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 @
f878bc64
...
@@ -915,17 +915,23 @@
...
@@ -915,17 +915,23 @@
})
})
.
declareMethod
(
'
getContent
'
,
function
()
{
.
declareMethod
(
'
getContent
'
,
function
()
{
var
gadget
=
this
;
var
gadget
=
this
,
content_dict
=
{};
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]
'
);
if
(
software_type
!==
null
)
{
content_dict
.
software_type
=
software_type
.
value
;
}
if
(
text_content
!==
null
)
{
if
(
text_content
!==
null
)
{
return
text_content
.
value
;
return
text_content
.
value
;
}
}
return
gadget
.
processValidation
(
gadget
.
options
.
value
.
parameter
.
json_url
);
return
gadget
.
processValidation
(
gadget
.
options
.
value
.
parameter
.
json_url
);
})
})
.
push
(
function
(
xml_result
)
{
.
push
(
function
(
xml_result
)
{
return
{
"
text_content
"
:
xml_result
};
content_dict
.
text_content
=
xml_result
;
return
content_dict
;
})
})
.
fail
(
function
(
e
)
{
.
fail
(
function
(
e
)
{
return
{};
return
{};
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml
View file @
f878bc64
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
965.
35301.48944.13226
</string>
</value>
<value>
<string>
965.
52522.13952.27733
</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>
151
8802908.99
</float>
<float>
151
9836241.61
</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