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

B #5556: Disk size slider only goes up to 508GB (#579)

Browse Source
This commit is contained in:
Abel Coronado 2017-11-16 15:07:41 +01:00 committed by Tino Vázquez
parent 0e6add9dba
commit 9d43f75ed6
6 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -957,7 +957,7 @@ define(function(require) {
$("#provision_create_vm .provision_vmgroup").show();
$("#provision_create_vm .provision_ds").show();
OpenNebulaTemplate.show({
OpenNebula.Template.show({
data : {
id: template_id,
extended: false

7
src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js
View File

@ -82,9 +82,10 @@ define(function(require) {
Tips.setup(context);
$( ".diskSlider", context).html(RangeSlider.html({
min: that.diskSize,
max: Humanize.sizeToMB("500GB")*1024,
max: Humanize.sizeToMB("1024GB")*1024,
initial: that.diskSize,
name: "resize"
name: "resize",
max_value: ""
}));
$( ".uinput-slider-val",context).prop('type', 'text');
$( ".uinput-slider-val",context).val(Humanize.size($( ".uinput-slider",context).val()));
@ -115,7 +116,7 @@ define(function(require) {
$('#' + DIALOG_ID + 'Form', context).submit(function() {
var new_size = $( ".uinput-slider",context).val();
var new_size = $( ".uinput-slider-val",context).val();
new_size = Math.round(parseInt(new_size) / 1024);
new_size = new_size.toString();
var obj = {

28
src/sunstone/public/app/utils/disks-resize.js
View File

@ -22,6 +22,7 @@ define(function(require){
var UserInputs = require('utils/user-inputs');
var WizardFields = require('utils/wizard-fields');
var DisksResizeTemplate = require('hbs!./disks-resize/html');
var Humanize = require('utils/humanize');
return {
'insert': _insert,
@ -112,22 +113,20 @@ define(function(require){
var diskContext;
$(".disksContainer", disksContext).html("");
if (disks_base) {
$.each(disks_base, function(disk_id, disk) {
diskContext = $(
'<div class="row diskContainer">'+
'<div class="small-12 columns">'+
'<label></label>'+
'</div>'+
'<div class="large-12 columns diskSlider">' +
'</div>' +
'</div>').appendTo($(".disksContainer", disksContext));
diskContext.data('template_disk', disk);
});
}
$.each(disks, function(disk_id, disk) {
diskContext = $(
'<div class="row diskContainer">'+
'<div class="small-12 columns">'+
'<label></label>'+
'</div>'+
'<div class="large-12 columns diskSlider">' +
'</div>' +
'</div>').appendTo($(".disksContainer", disksContext));
if (disks_base) {
diskContext.data('template_disk', disks_base[disk_id]);
}
var disk_snapshot_total_size = 0;
if (disk.DISK_SNAPSHOT_TOTAL_SIZE != undefined) {
@ -191,7 +190,7 @@ define(function(require){
if (disk.SIZE != undefined){
// Range from original size to size + 500GB
var min = parseInt(disk.SIZE);
var max = min + 512000;
var max = min + Humanize.sizeToMB("1024GB");
attr = UserInputs.parse(
"SIZE",
@ -202,6 +201,7 @@ define(function(require){
"M|number|"+label+"||");
}
}
attr.max_value = "";
if(!opts.uinput_mb){
$(".diskSlider", diskContext).html(UserInputs.attributeInput(attr));
} else {

1
src/sunstone/public/app/utils/range-slider.js
View File

@ -54,7 +54,6 @@ define(function(require) {
tick_val += opts.tick_size;
}
}
sliderId += 1;
return TemplateHTML(opts);
}

10
src/sunstone/public/app/utils/range-slider/html.hbs
View File

@ -23,8 +23,8 @@
{{/if}}
<div class="large-8 small-6 columns">
<input id="input-{{sliderId}}" type="range" class="uinput-slider"
min="{{min}}" max="{{max}}" step="{{step}}"
value="{{initial}}"
min="{{min}}" max="{{max}}" step="{{step}}"
value="{{initial}}"
list="uinput-list-{{sliderId}}"
{{#if disabled}}disabled="true"{{/if}}/>
<datalist id="uinput-list-{{sliderId}}">
@ -34,9 +34,9 @@
</datalist>
</div>
<div class="large-4 small-6 columns">
<input type="number" class="uinput-slider-val"
min="{{min}}" max="{{max}}" step="{{step}}"
value="{{initial}}"
<input type="number" class="uinput-slider-val"
min="{{min}}" max="{{max_value}}" step="{{step}}"
value="{{initial}}"
{{#unless wizard_field_disabled}}wizard_field="{{name}}"{{/unless}}
{{#if disabled}}disabled="true"{{/if}} required/>
</div>

3
src/sunstone/public/app/utils/user-inputs.js
View File

@ -719,6 +719,9 @@ define(function(require) {
break;
case "range":
case "range-float":
if(attr.max_value != ""){
attr.max_value = attr.max;
}
input = RangeSlider.html(attr);
break;