shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

B #5152: Fix user inputs in flow (#375)

Browse Source
This commit is contained in:
Sergio Betanzos 2020-10-29 15:17:23 +01:00 committed by GitHub
parent 096d94b18d
commit 89e36f7b24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js
View File

@ -254,38 +254,52 @@ define(function(require) {
}
});
}
$.each(that.service_template_json.DOCUMENT.TEMPLATE.BODY.roles, function(index, role){
var temp_role = role;
var temp_role = {};
$.extend( temp_role, role);
var div_id = "user_input_role_"+index;
var tmp_json = {};
var stringCustomValues = TemplateUtils.templateToString(extra_info.merge_template.custom_attrs_values);
$.extend( tmp_json, WizardFields.retrieve($("#"+div_id, context)) );
role.user_inputs_values = tmp_json;
temp_role.user_inputs_values = tmp_json;
var stringCustomValues = TemplateUtils.templateToString(extra_info.merge_template.custom_attrs_values);
if (stringCustomValues) {
(temp_role.vm_template_contents)
? temp_role.vm_template_contents += stringCustomValues
: temp_role.vm_template_contents = stringCustomValues;
}
$("#instantiate_service_role_user_inputs").find("select").each(function(key, vm_group){
$("#instantiate_service_role_user_inputs").find("select").each(function(_, vm_group){
var element = $(vm_group);
rolevm_group = element.attr("data-role");
vm_group_value = element.children("option:selected").val();
if(rolevm_group && role.name && rolevm_group === role.name && vm_group_value){
if(temp_role.vm_template_contents === undefined){
temp_role.vm_template_contents = "";
}
temp_role.vm_template_contents += TemplateUtils.templateToString({VMGROUP:{ROLE:role.name,VMGROUP_ID:vm_group_value}});
temp_role.vm_template_contents += TemplateUtils.templateToString({
VMGROUP:{
ROLE: role.name,
VMGROUP_ID: vm_group_value
}
});
}
});
if(charters && charters.length){
if(temp_role.vm_template_contents !== undefined){
temp_role.vm_template_contents += charters;
}else{
temp_role.vm_template_contents = charters;
}
(temp_role.vm_template_contents !== undefined)
? temp_role.vm_template_contents += charters
: temp_role.vm_template_contents = charters;
}
extra_info.merge_template.roles.push(temp_role);
});
charters = "";
}
if (!service_name.length){ //empty name

5
src/sunstone/public/app/utils/service-utils.js
View File

@ -22,7 +22,10 @@ define(function(require) {
};
function _getExtraInfo(context) {
var custom_attrs_json = WizardFields.retrieve($(".custom_attr_class", context));
var custom_attrs_json = WizardFields.retrieve(
$("#instantiate_service_user_inputs .custom_attr_class", context)
);
var networks_json = WizardFields.retrieve($(".network_attrs_class", context));
var typePrefix = "type_";