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

F #1310: Changed texts and resized the section

Browse Source 
* F #1310: Changed texts and resized the section

* F #1310: Obtained list of TM_MAD_SYSTEM from datastores
This commit is contained in:
juanmont 2018-01-11 12:16:58 +01:00 committed by Ruben S. Montero
parent b714116f64
commit 796730b4b7
2 changed files with 41 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,10 @@ define(function(require) {
}
function _setup(context) {
Tips.setup(context);
var that = this;
this.ds_tm_mads = [];
var groupDropdownOptions = '<option value="">'+Locale.tr("Default")+'</option>';
that.numberOfDisks = 0;
that.diskTabObjects = {};
@ -109,10 +112,32 @@ define(function(require) {
that.listener.notify();
});
}
OpenNebula.Datastore.list({
timeout: true,
success: function(request, ds_list){
$.each(ds_list, function(ds_id, ds){
if (ds["DATASTORE"]["TEMPLATE"]["TYPE"] === "IMAGE_DS") {
tm_mad_system = ds["DATASTORE"]["TEMPLATE"]["TM_MAD_SYSTEM"]
if (tm_mad_system){
tm_mad_system.split(",").map(function(item) {
var i = item.trim();
if(that.ds_tm_mads.indexOf(i) === -1){
that.ds_tm_mads.push(i);
groupDropdownOptions += '<option elem_id="'+i+'" value="'+i+'">'+i+'</option>';
}
});
}
}
});
$('select#TM_MAD_SYSTEM', context).html(groupDropdownOptions);
}
});
}
function _retrieve(context) {
var templateJSON = WizardFields.retrieve(context);
var disksJSON = [];
var diskJSON;
$.each(this.diskTabObjects, function(id, diskTab) {
@ -132,13 +157,6 @@ define(function(require) {
function _fill(context, templateJSON) {
var that = this;
var disks = templateJSON.DISK
var modes = [];
var groupDropdownOptions = '<option value=></option>';
var tmpl_tm_mad_system;
if (templateJSON.TM_MAD_SYSTEM){
tmpl_tm_mad_system = templateJSON.TM_MAD_SYSTEM;
}
if (disks instanceof Array) {
$.each(disks, function(diskId, diskJSON) {
@ -148,78 +166,24 @@ define(function(require) {
var diskTab = that.diskTabObjects[that.numberOfDisks];
var diskContext = $('#' + diskTab.diskTabId, context);
OpenNebula.Image.show({
timeout: true,
data : {
name: diskJSON.IMAGE,
uname: diskJSON.IMAGE_UNAME
},
success: function(request, obj_file){
OpenNebula.Datastore.show({
data : {
id: obj_file.IMAGE.DATASTORE_ID
},
timeout: true,
success: function(request, ds){
var tm_mad_system = ds.DATASTORE.TEMPLATE.TM_MAD_SYSTEM;
if (tm_mad_system) {
tm_mad_system.split(",").map(function(item) {
var i = item.trim();
if(modes.indexOf(i) === -1){
modes.push(i);
groupDropdownOptions += '<option elem_id="'+i+'" value="'+i+'">'+i+'</option>';
}
});
$('select#TM_MAD_SYSTEM', context).html(groupDropdownOptions);
if ( tmpl_tm_mad_system ){
$('select#TM_MAD_SYSTEM', context).val(tmpl_tm_mad_system);
}
}
}
});
}
});
diskTab.fill(diskContext, diskJSON);
});
} else if (disks instanceof Object) {
var diskTab = that.diskTabObjects[that.numberOfDisks];
var diskContext = $('#' + diskTab.diskTabId, context);
OpenNebula.Image.show({
timeout: true,
data : {
name: disks.IMAGE,
uname: disks.IMAGE_UNAME
},
success: function(request, obj_file){
OpenNebula.Datastore.show({
data : {
id: obj_file.IMAGE.DATASTORE_ID
},
timeout: true,
success: function(request, ds){
var tm_mad_system = ds.DATASTORE.TEMPLATE.TM_MAD_SYSTEM;
if (tm_mad_system) {
tm_mad_system.split(",").map(function(item) {
var i = item.trim();
if(modes.indexOf(i) === -1){
modes.push(i);
groupDropdownOptions += '<option elem_id="'+i+'" value="'+i+'">'+i+'</option>';
}
});
$('select#TM_MAD_SYSTEM', context).html(groupDropdownOptions);
if ( tmpl_tm_mad_system ){
$('select#TM_MAD_SYSTEM', context).val(tmpl_tm_mad_system);
}
}
}
});
}
});
diskTab.fill(diskContext, disks);
}
if ( templateJSON.TM_MAD_SYSTEM ){
$('select#TM_MAD_SYSTEM', context).val(templateJSON.TM_MAD_SYSTEM);
if ( !$('select#TM_MAD_SYSTEM', context).val() ) {
$('select#TM_MAD_SYSTEM', context).val("");
}
delete templateJSON.TM_MAD_SYSTEM;
} else {
$('select#TM_MAD_SYSTEM', context).val("");
}
if (templateJSON.DISK) {
delete templateJSON.DISK;
}

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

@ -15,13 +15,17 @@
{{! -------------------------------------------------------------------------- }}
<div class="row">
<div class="medium-2 columns"></div>
<div class="medium-10 columns">
<div class="medium-12 columns">
<fieldset>
<legend>{{tr "Deployment Requirements"}}</legend>
<legend>{{tr "Storage Options"}}</legend>
<div class="row">
<div class="medium-12 columns">
<label for="TM_MAD_SYSTEM">
{{tr "Deploy Mode"}}
&emsp;
<span class="tip">
{{tr "Set an alternative mode to deploy VM disks to the hosts"}}
</span>
</label>
<select wizard_field="TM_MAD_SYSTEM" id="TM_MAD_SYSTEM" name="TM_MAD_SYSTEM">
</select>