Commit f878bc64 authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_jio: Include software_type on the getContent of the parameter form.

parent 0ee93f11
...@@ -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 {};
......
...@@ -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>1518802908.99</float> <float>1519836241.61</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment