From f790ca94a9ec6af91d4cbec1127d6e509a286cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 19 Oct 2015 16:58:18 +0200 Subject: [PATCH] Bug #4017: Disable slider for persistent images. Add label to volatile disks (cherry picked from commit dd3d1efb363d9f2b5eb9c91588eebc261c0c8a40) --- src/sunstone/public/app/utils/disks-resize.js | 11 ++++++++--- src/sunstone/public/app/utils/range-slider.js | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/sunstone/public/app/utils/disks-resize.js b/src/sunstone/public/app/utils/disks-resize.js index 7881bf53b0..e10c85e7e8 100644 --- a/src/sunstone/public/app/utils/disks-resize.js +++ b/src/sunstone/public/app/utils/disks-resize.js @@ -108,15 +108,20 @@ define(function(require){ var sizeGB = disk.SIZE / 1024; diskContext.data('original_size', sizeGB); + + var label = disk.IMAGE ? disk.IMAGE : Locale.tr("Volatile Disk"); + var enabled = !(disk.PERSISTENT && disk.PERSISTENT.toUpperCase() == "YES"); + RangeSlider.insert({ - 'label': disk.IMAGE, + 'label': label, 'unitLabel': 'GB', 'name': 'SIZE', 'start': sizeGB, 'end': sizeGB + 500, 'step': 10, - 'startValue': sizeGB - }, $(".diskSlider", diskContext)) + 'startValue': sizeGB, + 'enabled': enabled + }, $(".diskSlider", diskContext)); }) } }) diff --git a/src/sunstone/public/app/utils/range-slider.js b/src/sunstone/public/app/utils/range-slider.js index 5876ba51fb..a5ebb4f867 100644 --- a/src/sunstone/public/app/utils/range-slider.js +++ b/src/sunstone/public/app/utils/range-slider.js @@ -32,6 +32,7 @@ define(function(require) { opts.end End value of the slider opts.step Step value of the slider opts.startValue Initialize the slider with this value + opts.enabled false to disable the inputs (true by default) @param {Object} context div to insert the range slider @returns {String} HTML row */ @@ -61,5 +62,10 @@ define(function(require) { slider.foundation('slider', 'set_value', opts.startValue); input.val(opts.startValue); } + + if (opts.enabled == false){ + input.attr('disabled', 'disabled'); + slider.attr('disabled', 'disabled'); + } } });