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

Feature #4363 #4128: Fix service cardinality range inputs

Browse Source
This commit is contained in:
Carlos Martín 2016-05-18 13:03:23 +02:00
parent 22963d61af
commit 366b47823b
2 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/sunstone/public/app/tabs/provision-tab.js
View File

@ -113,15 +113,11 @@ define(function(require) {
'</legend>' +
'<div class="row">'+
'<div class="large-12 columns">'+
'<label>'+
'<span class="cardinality_value">'+role_template.cardinality+' </span>'+
'<span>'+Locale.tr("VMs")+'</span>'+
'<div class="cardinality_slider_div">'+
'</div>'+
'<div class="cardinality_no_slider_div">'+
'<span class="">'+Locale.tr("The cardinality for this role cannot be changed")+'</span>'+
'</div>'+
'</label>'+
'<div class="cardinality_slider_div">'+
'</div>'+
'<div class="cardinality_no_slider_div">'+
'<label>'+Locale.tr("The cardinality for this role cannot be changed")+'</label>'+
'</div>'+
'</div>'+
'</div>'+
'</fieldset>');
@ -191,14 +187,15 @@ define(function(require) {
$( ".cardinality_slider_div", context).html(RangeSlider.html({
min: min_vms,
max: max_vms,
initial: role_template.cardinality
initial: role_template.cardinality,
label: Locale.tr("Number of VMs for Role")+" "+role_template.name,
name: "cardinality"
}));
$( ".cardinality_slider_div", context).show();
$( ".cardinality_no_slider_div", context).hide();
$( ".cardinality_slider_div", context).on("input", '.uinput-slider', function() {
$(".cardinality_value", context).html($(this).val());
$( ".cardinality_slider_div", context).on("input", 'input', function() {
var cost_value = $(".provision_create_service_cost_div", context).data("cost")*$(this).val();
$(".cost_value", context).html(cost_value.toFixed(2));
});
@ -1250,8 +1247,10 @@ define(function(require) {
var role_template = $(this).data("opennebula");
var cardinality = WizardFields.retrieve( $(".provision_cardinality_selector", $(this)) )["cardinality"];
roles.push($.extend(role_template, {
"cardinality": $(".cardinality_value", $(this)).text(),
"cardinality": cardinality,
"user_inputs_values": user_inputs_values
}));
})

21
src/sunstone/public/app/tabs/provision-tab/flows/list.js
View File

@ -436,13 +436,7 @@ define(function(require) {
'<div class="row">'+
'<div class="large-12 large-centered columns">'+
'<div class="row">'+
'<div class="large-4 columns text-center">'+
'<h5 class="cardinality_value">'+role.cardinality+
'<br>'+
'<small>'+role.name + ' ' + Locale.tr("VMs")+'</small>'+
'</h5>'+
'</div>'+
'<div class="large-8 columns">'+
'<div class="large-8 small-centered columns">'+
'<div class="cardinality_slider_div">'+
'</div>'+
'<br>'+
@ -458,24 +452,17 @@ define(function(require) {
'</button>'+
'</div>');
//TODO context.foundation('slider', 'reflow');
if (max_vms > min_vms) {
$( ".cardinality_slider_div", context).html(RangeSlider.html({
min: min_vms,
max: max_vms,
initial: role.cardinality
initial: role.cardinality,
label: Locale.tr("Number of VMs for Role")+" "+role.name
}));
$( ".cardinality_slider_div", context).show();
$(".provision_change_cardinality_button").show();
$( ".cardinality_no_slider_div", context).hide();
$( ".cardinality_slider_div", context).on("input", '.uinput-slider', function() {
$(".cardinality_value",context).html($(this).val())
});
$( ".cardinality_slider", context).on('change.fndtn.slider', function(){
});
} else {
$( ".cardinality_slider_div", context).hide();
$(".provision_change_cardinality_button").hide();
@ -487,7 +474,7 @@ define(function(require) {
context.on("click", ".provision_change_cardinality_button", function(){
var flow_id = $(".provision_info_flow", context).attr("flow_id");
var cardinality = $('.uinput-slider-value', context).val();
var cardinality = $('.uinput-slider-val', context).val();
OpenNebula.Role.update({
data : {