shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-02 10:50:07 +03:00
Code Releases Wiki Activity

B #5370: Solved bug when import vCenter template (#477)

Browse Source
This commit is contained in:
Abel Coronado 2017-09-15 16:23:51 +02:00 committed by Jaime Melis
parent 1dfdc20438
commit da0ca8d6d0
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/sunstone/public/app/utils/vcenter/templates.js
View File

@ -27,6 +27,7 @@ define(function(require) {
var UniqueId = require('utils/unique-id');
var VCenterCommon = require('./vcenter-common');
var Sunstone = require('sunstone');
var Tips = require('utils/tips');
var TemplateHTML = require('hbs!./common/html');
var RowTemplate = require('hbs!./templates/row');
@ -112,16 +113,30 @@ define(function(require) {
if (element.rp && element.rp !== '') {
opts.resourcePool = UserInputs.unmarshall(element.rp);
opts.resourcePool.params = opts.resourcePool.params.split(",");
$.each(opts.resourcePool.params, function(){
/* $.each(opts.resourcePool.params, function(){
$("#available_rps_" + opts.id + " [value ='" + this + "']").mousedown(function(e) {
e.preventDefault();
$(this).prop('selected', !$(this).prop('selected'));
return false;
});
});
});*/
}
var trow = $(RowTemplate(opts)).appendTo(tbody);
Tips.setup(trow);
$("#modify_rp_" + opts.id).change(function(){
var val = $("#modify_rp_" + opts.id).val();
if (val == "default"){
$("#div_rp_" + opts.id).hide();
} else if (val == "fixed"){
$("#div_rp_" + opts.id).show();
$("#available_rps_" + opts.id).attr("multiple", false);
} else {
$("#div_rp_" + opts.id).show();
$("#available_rps_" + opts.id).attr("multiple", true);
}
});
$("#linked_clone_"+opts.id).on("change", function(){
if ($("#linked_clone_"+opts.id).is(":checked")){
@ -387,8 +402,6 @@ define(function(require) {
++index;
getNext();
}
}
}
getNext();
@ -410,7 +423,6 @@ define(function(require) {
var rpInput = $(".vcenter_rp_input", row_context);
if (rpInput.length > 0) {
var rpModify = $('.modify_rp', rpInput).val();
var rpInitial = $('.initial_rp', rpInput).val();
var rpParams = "";
var linkedClone = $('.linked_clone', rpInput).prop("checked");
var createCopy = $('.create_copy', rpInput).prop("checked");
@ -437,13 +449,13 @@ define(function(require) {
});
var rpParams = rpParams.slice(0,-1);
if (rpModify === 'fixed' && rpInitial !== '') {
attrs.push('VCENTER_RESOURCE_POOL="' + rpInitial + '"');
if (rpModify === 'fixed' && rpParams!== '') {
attrs.push('VCENTER_RESOURCE_POOL="' + rpParams + '"');
} else if (rpModify === 'list' && rpParams !== '') {
var rpUserInputs = UserInputs.marshall({
type: 'list',
description: Locale.tr("Which resource pool you want this VM to run in?"),
initial: rpInitial,
initial: "",
params: rpParams
});

16
src/sunstone/public/app/utils/vcenter/templates/row.hbs
View File

@ -34,25 +34,23 @@
<div id="{{data.vcenter_ref}}Advanced" class="content" hidden>
{{#if resourcePool}}
<div class="vcenter_rp_input row" style="margin-left: 11px">
<div class="medium-3 columns">
<label>
{{tr "Default Resource Pool"}}
<input type="text" class="initial_rp" value="{{resourcePool.initial}}"/>
</label>
</div>
<div class="medium-3 columns">
<label>
{{tr "Type"}}
<select class="modify_rp">
<select class="modify_rp" id="modify_rp_{{id}}">
<option value="default">{{tr "Default"}}</option>
<option value="fixed">{{tr "Fixed"}}</option>
<option value="list">{{tr "Provide on instantiation"}}</option>
</select>
</label>
</div>
<div class="medium-4 columns end">
<div class="medium-4 columns end" id="div_rp_{{id}}" hidden>
<label>
{{tr "Available Resource Pools"}}
<select multiple="true" size="3" class="available_rps" id="available_rps_{{id}}">
<span class="tip">
{{tr "Use ctrl key for multiple selection (provide on instantiation)."}}
</span>
<select required style="height: 60px" size="5" class="available_rps" id="available_rps_{{id}}">
{{#each resourcePool.params}}
<option value="{{this}}" selected>{{this}}</option>
{{/each}}