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

F #4989: Format datablock on creation (#893)

Browse Source 
Signed-off-by: Frederick Borges <fborges@opennebula.io>
This commit is contained in:
Frederick Borges 2021-03-01 12:18:13 +01:00 committed by GitHub
parent dad1dc8eb7
commit 35654ec082
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
View File

@ -252,6 +252,11 @@ define(function(require) {
img_json["FORMAT"] = driver;
}
var filesystem = WizardFields.retrieveInput($("#img_fs", context));
if (filesystem != undefined && filesystem.length) {
img_json["FS"] = filesystem;
}
var target = WizardFields.retrieveInput($("#img_target", context));
if (target)
img_json["TARGET"] = target;

12
src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image.js
View File

@ -73,6 +73,16 @@ define(function(require) {
return WizardTab;
function optionsFilesystem(){
var rtn = "<option value=''>--</option>";
if(config && config.system_config && config.system_config.support_fs && Array.isArray(config.system_config.support_fs)){
config.system_config.support_fs.forEach(element => {
rtn += "<option value='"+element+"'>"+element+"</option>";
});
}
return rtn;
};
/*
FUNCTION DEFINITIONS
*/
@ -87,6 +97,7 @@ define(function(require) {
"prepend": prepend,
"formPanelId": this.formPanelId,
"customTagsHTML": CustomTagsTable.html(),
"optionsFilesystem": optionsFilesystem(),
}),
"advanced": TemplateAdvancedHTML({
"prepend": prepend,
@ -382,4 +393,3 @@ define(function(require) {
}
});

10
src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image/html.hbs
View File

@ -193,6 +193,16 @@
<input type="text" name="{{prepend}}_target" id="{{prepend}}_target" />
</div>
</div>
<div class="row not_vcenter">
<div class="large-12 columns datablock-input">
<label for="{{prepend}}_fs">
{{tr "Filesystem"}}
</label>
<select name="{{prepend}}_fs" id="{{prepend}}_fs">
{{{optionsFilesystem}}}
</select>
</div>
</div>
</div>
</div>
<br>

2
src/sunstone/public/app/tabs/images-tab/panels/info-common.js
View File

@ -61,7 +61,7 @@ define(function(require) {
var templateTableHTML = TemplateTable.html(this.element.TEMPLATE, this.resource, Locale.tr("Attributes"));
var permissionsTableHTML = PermissionsTable.html(this.tabId, this.resource, this.element);
var prettyRegTime = Humanize.prettyTime(this.element.REGTIME);
var fsTypeStr = this.element.FS_TYPE != undefined ? this.element.FS_TYPE : '-';
var fsTypeStr = this.element.FS != undefined ? this.element.FS : '-';
var sizeStr = Humanize.sizeFromMB(this.element.SIZE);
var persistentStr = parseInt(this.element.PERSISTENT) ? Locale.tr("yes") : Locale.tr("no");

5
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
View File

@ -65,7 +65,7 @@ define(function(require) {
*/
function optionsFilesystem(){
var rtn = "";
var rtn = "<option value=''>-</option>";
if(config && config.system_config && config.system_config.support_fs && Array.isArray(config.system_config.support_fs)){
config.system_config.support_fs.forEach(element => {
rtn += "<option value='"+element+"'>"+element+"</option>";
@ -134,10 +134,13 @@ define(function(require) {
if($("select#FORMAT_KVM", volatileContext).val() === "qcow2"){
$("select#DRIVER", volatileContext).val("qcow2");
}
$("select#FS_KVM", volatileContext).parent().show();
break;
case "swap":
$("select#FORMAT_KVM", volatileContext).parent().hide();
$("select#DRIVER", volatileContext).val("");
$("select#FS_KVM", volatileContext).val("");
$("select#FS_KVM", volatileContext).parent().hide();
break;
}
});

2
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
View File

@ -99,7 +99,7 @@
<label for="TYPE">
{{tr "Filesystem"}}
</label>
<select class="hypervisor only_kvm" wizard_field="FS" id="TYPE_KVM" name="type">
<select class="hypervisor only_kvm" wizard_field="FS" id="FS_KVM" name="type">
{{{optionsFilesystem}}}
</select>
</div>