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

F #4913 Added CCR_REF and INSTANCE_ID inputs to general tab (#269)

Browse Source
This commit is contained in:
Abel Coronado 2017-04-25 12:38:22 +02:00 committed by Tino Vázquez
parent aeaa7ce666
commit 9fc7770cb1
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
View File

@ -161,8 +161,12 @@ define(function(require) {
if (this.value == "vcenter"){
$("#vcenter_template_ref", context).attr("required", "");
$("#vcenter_instance_id", context).attr("required", "");
$("#vcenter_ccr_ref", context).attr("required", "");
} else {
$("#vcenter_template_ref", context).removeAttr("required");
$("#vcenter_instance_id", context).removeAttr("required");
$("#vcenter_ccr_ref", context).removeAttr("required");
}
// There is another listener in context.js setup
});
@ -188,6 +192,8 @@ define(function(require) {
templateJSON["MEMORY_COST"] = templateJSON["MEMORY_COST"] * 1024;
if (templateJSON["HYPERVISOR"] == 'vcenter') {
templateJSON["VCENTER_TEMPLATE_REF"] = WizardFields.retrieveInput($("#vcenter_template_ref", context));
templateJSON["VCENTER_CCR_REF"] = WizardFields.retrieveInput($("#vcenter_ccr_ref", context));
templateJSON["VCENTER_INSTANCE_ID"] = WizardFields.retrieveInput($("#vcenter_instance_id", context));
if (Config.isFeatureEnabled("vcenter_vm_folder")) {
templateJSON["VCENTER_VM_FOLDER"] = WizardFields.retrieveInput($("#vcenter_vm_folder", context))
@ -309,6 +315,16 @@ define(function(require) {
delete templateJSON["VCENTER_TEMPLATE_REF"];
}
if(templateJSON["VCENTER_CCR_REF"]){
WizardFields.fillInput($("#vcenter_ccr_ref", context), templateJSON["VCENTER_CCR_REF"]);
delete templateJSON["VCENTER_CCR_REF"];
}
if(templateJSON["VCENTER_INSTANCE_ID"]){
WizardFields.fillInput($("#vcenter_instance_id", context), templateJSON["VCENTER_INSTANCE_ID"]);
delete templateJSON["VCENTER_INSTANCE_ID"];
}
CapacityCreate.fill($("div.capacityCreate", context), templateJSON);
WizardFields.fill(context, templateJSON);

14
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs
View File

@ -62,6 +62,20 @@
<input type="text" id="vcenter_template_ref"/>
</div>
</div>
<div class="row hypervisor only_vcenter" style="display: none;">
<div class="medium-6 columns">
<label for="vcenter_ccr_ref">
{{tr "vCenter Cluster Ref"}}
</label>
<input type="text" id="vcenter_ccr_ref"/>
</div>
<div class="medium-6 columns">
<label for="vcenter_instance_id">
{{tr "vCenter Instance ID"}}
</label>
<input type="text" id="vcenter_instance_id"/>
</div>
</div>
<div class="vcenter_rp_input row">
<div class="large-3 medium-6 columns">
<label>