Skip to content

Commit a10e539

Browse files
shwstppryadvr
authored andcommitted
ui: fix for custom constrained offering params range check (#3545)
This PR fixes range check in VM deployment wizard while using custom constrained offering. Existing code was failing while checking user input value in the form for CPU cores and RAM size when minimum and maximum value vary in digit count. Also, while re-selecting offerings slider position was not restored to minimum value. THis has been fixed with changes. Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent 5dc982d commit a10e539

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

ui/scripts/ui-custom/instanceWizard.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,8 @@
636636
$step.find('.custom-slider-container').show();
637637
var setupSlider = function(sliderClassName, minVal, maxVal) {
638638
$step.find('.custom-slider-container .' + sliderClassName + ' .size.min span').html(minVal);
639-
$step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(minVal);
640639
$step.find('.custom-slider-container .' + sliderClassName + ' .size.max span').html(maxVal);
640+
$step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(minVal);
641641
$step.find('.custom-slider-container .' + sliderClassName + ' .slider').each(function() {
642642
var $slider = $(this);
643643
$slider.slider({
@@ -651,20 +651,22 @@
651651
});
652652

653653
$step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').bind('change', function() {
654-
var val = $step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val();
654+
var val = parseInt($(this).val(), 10);
655655
if (val < minVal || val > maxVal) {
656656
cloudStack.dialog.notice({ message: $.validator.format(_l('message.validate.range'), [minVal, maxVal]) });
657657
}
658658
if (val < minVal) {
659659
val = minVal;
660-
$step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(val);
660+
$(this).val(val);
661661
}
662662
if(val > maxVal) {
663663
val = maxVal;
664-
$step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(val);
664+
$(this).val(val);
665665
}
666666
$step.find('span.custom-slider-container .' + sliderClassName).html(_s(val));
667+
$step.find('.custom-slider-container .' + sliderClassName + ' span.ui-slider-handle').css('left', (((val-minVal)/(maxVal-minVal))*100)+'%');
667668
});
669+
$step.find('.custom-slider-container .' + sliderClassName + ' span.ui-slider-handle').css('left', '0%');
668670
}
669671
setupSlider('slider-cpu-cores', minCpuNumber, maxCpuNumber);
670672
setupSlider('slider-memory-mb', minMemory, maxMemory);

0 commit comments

Comments
 (0)