Commit 44e98efe authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_cloud: No need store/accept parameter_hash

   It is better use the parameter_xml directly since, since there are no need for the editor
   handle hashed version of the parameters.
parent 2773c6aa
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
</fieldset> </fieldset>
<fieldset id="parameter-optional"> </fieldset> <fieldset id="parameter-optional"> </fieldset>
<fieldset id="parameter-xml"> <fieldset id="parameter-xml">
<input type=hidden name="parameter_hash" class="parameter_hash_output">
<input type=hidden name="shared" class="parameter_shared"> <input type=hidden name="shared" class="parameter_shared">
<input type=hidden name="schema_url" class="parameter_schema_url"> <input type=hidden name="schema_url" class="parameter_schema_url">
</fieldset> </fieldset>
......
/*jslint nomen: true, maxlen: 200, indent: 2, unparam: true*/ /*jslint nomen: true, maxlen: 200, indent: 2, unparam: true*/
/*global rJS, console, window, btoa, atob, XMLSerializer, /*global rJS, console, window, XMLSerializer,
DOMParser, URI, vkbeautify, domsugar, Boolean */ DOMParser, URI, vkbeautify, domsugar, Boolean */
(function (window, rJS, XMLSerializer, DOMParser, vkbeautify, (function (window, rJS, XMLSerializer, DOMParser, vkbeautify,
...@@ -138,16 +138,11 @@ ...@@ -138,16 +138,11 @@
return {}; return {};
}) })
.push(function (json_dict) { .push(function (json_dict) {
var parameter_hash_input = g.element.querySelectorAll('.parameter_hash_output')[0], var serialisation_type = getSerialisationTypeFromForm(g.element);
serialisation_type = getSerialisationTypeFromForm(g.element),
xml_output;
if (serialisation_type === "json-in-xml") { if (serialisation_type === "json-in-xml") {
xml_output = jsonDictToParameterJSONInXML(json_dict); return jsonDictToParameterJSONInXML(json_dict);
} else {
xml_output = jsonDictToParameterXML(json_dict);
} }
parameter_hash_input.value = btoa(xml_output); return jsonDictToParameterXML(json_dict);
return xml_output;
}); });
} }
...@@ -513,15 +508,8 @@ ...@@ -513,15 +508,8 @@
.declareMethod('render', function (options) { .declareMethod('render', function (options) {
var restricted_softwaretype = false, var restricted_softwaretype = false,
software_type_list = [], software_type_list = [],
parameter_hash = options.parameter_hash,
// XXX Do we directly get parameter_xml parameter?
parameter_xml = options.parameter_xml; parameter_xml = options.parameter_xml;
if (parameter_hash !== undefined) {
// A JSON where provided via gadgetfield
parameter_xml = atob(parameter_hash);
}
if (options.software_type_list !== undefined) { if (options.software_type_list !== undefined) {
software_type_list = options.software_type_list; software_type_list = options.software_type_list;
} }
......
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