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

Merge pull request #241 from juanmont/feature-4913

Browse Source 
Feature 4913. Keep disks on done and datastore selection removal from vm create/update
This commit is contained in:
Miguel Cabrerizo 2017-04-10 19:26:41 +02:00 committed by GitHub
commit 423e75b9d8
2 changed files with 1 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,27 +207,6 @@ define(function(require) {
var userInputs = {};
// Retrieve Datastore Attribute
var dsInput = $(".vcenter_datastore_input", context);
if (dsInput.length > 0) {
var dsModify = WizardFields.retrieveInput($('.modify_datastore', dsInput));
var dsInitial = WizardFields.retrieveInput($('.initial_datastore', dsInput));
var dsParams = WizardFields.retrieveInput($('.available_datastores', dsInput));
if (dsModify === 'fixed' && dsInitial !== '') {
templateJSON['VCENTER_DATASTORE'] = dsInitial;
} else if (dsModify === 'list' && dsParams !== '') {
var dsUserInputsStr = UserInputs.marshall({
type: 'list',
description: Locale.tr("Which datastore you want this VM to run on?"),
initial: dsInitial,
params: dsParams
});
userInputs['VCENTER_DATASTORE'] = dsUserInputsStr;
}
}
// Retrieve Resource Pool Attribute
var rpInput = $(".vcenter_rp_input", context);
if (rpInput.length > 0) {
@ -272,13 +251,6 @@ define(function(require) {
delete sunstone_template["NETWORK_SELECT"];
}
if (templateJSON["HYPERVISOR"] == 'vcenter' &&
templateJSON["KEEP_DISKS_ON_DONE"] &&
templateJSON["KEEP_DISKS_ON_DONE"].toLowerCase() == "yes" ) {
$("#KEEP_DISKS", context).attr("checked", "checked");
}
delete templateJSON["KEEP_DISKS_ON_DONE"];
if (Config.isFeatureEnabled("vcenter_vm_folder")) {
if (templateJSON["HYPERVISOR"] == 'vcenter' &&
@ -325,6 +297,7 @@ define(function(require) {
}
}
if (templateJSON["VCENTER_RESOURCE_POOL"]) {
$('.modify_rp', context).val('fixed');
WizardFields.fillInput($('.initial_rp', context), templateJSON["VCENTER_RESOURCE_POOL"]);

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

@ -61,64 +61,6 @@
</label>
<input type="text" id="vcenter_template_ref"/>
</div>
<div class="medium-6 columns">
<div class="row">
<div class="large-6 columns">
<label>
{{tr "VM disks"}}
{{{tip (tr "If selected, VM disks won't be deleted after the VM finishes its lifecycle.")}}}
</label>
<input type="checkbox" id="KEEP_DISKS" name="KEEP_DISKS"/>
<label for="KEEP_DISKS">{{tr "Keep"}}</label>
</div>
</div>
</div>
</div>
<div class="vcenter_datastore_input row">
<div class="large-3 medium-6 columns">
<label>
{{tr "Default Datastore"}}
<input type="text" class="initial_datastore" value="{{datastore.initial}}"/>
</label>
</div>
<div class="large-3 medium-6 columns">
<label>
{{tr "Type"}}
<select class="modify_datastore">
<option value="fixed">{{tr "Fixed"}}</option>
<option value="list">{{tr "Provide on instantiation"}}</option>
</select>
</label>
</div>
<div class="large-6 medium-12 columns">
<label>
{{tr "Available Datastores"}}
<input type="text" class="available_datastores" value="{{datastore.params}}"/>
</label>
</div>
</div>
<div class="vcenter_rp_input row">
<div class="large-3 medium-6 columns">
<label>
{{tr "Default Resource Pool"}}
<input type="text" class="initial_rp" value="{{resourcePool.initial}}"/>
</label>
</div>
<div class="large-3 medium-6 columns">
<label>
{{tr "Type"}}
<select class="modify_rp">
<option value="fixed">{{tr "Fixed"}}</option>
<option value="list">{{tr "Provide on instantiation"}}</option>
</select>
</label>
</div>
<div class="large-6 medium-12 columns">
<label>
{{tr "Available Resource Pools"}}
<input type="text" class="available_rps" value="{{resourcePool.params}}"/>
</label>
</div>
</div>
<div class="vcenter_vm_folder_input row">
<div class="medium-6 columns">