3:13 p.m.
This patch changes kimchi.listStorageVolumes function to receive
a new parameter 'sync' in order to set it as synchronous call.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 7 ++++---
src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js | 2 +-
src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
b/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
index b1acdb9..d5e9ddd 100644
--- a/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
+++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
@@ -393,12 +393,13 @@ var kimchi = {
});
},
- listStorageVolumes : function(poolName, suc, err) {
+ listStorageVolumes : function(poolName, suc, err, sync) {
$.ajax({
url : 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName) +
'/storagevolumes',
type : 'GET',
contentType : 'application/json',
dataType : 'json',
+ async : !sync,
success : suc,
error : err
});
@@ -452,7 +453,7 @@ var kimchi = {
return;
}
suc(isos, true);
- }, err);
+ }, err, false);
} else if (status === "running") {
if (deepScanHandler.stop) {
return;
@@ -463,7 +464,7 @@ var kimchi = {
}
suc(isos, false);
setTimeout(monitorTask, 2000);
- }, err);
+ }, err, false);
} else if (status === "failed") {
if (deepScanHandler.stop) {
return;
diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
b/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
index ec07cf0..d6606ee 100644
--- a/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
+++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
@@ -94,7 +94,7 @@ kimchi.guest_storage_add_main = function() {
}
}
$('#guest-disk').selectMenu("setData", options);
- });
+ }, null, false);
});
diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
b/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
index 40a43f6..cba8fb4 100644
--- a/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
+++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
@@ -282,7 +282,7 @@ kimchi.doListVolumes = function(poolObj) {
slide.slideDown('slow');
}, function(err) {
wok.message.error(err.responseJSON.reason);
- });
+ }, false);
}
kimchi.initLogicalPoolExtend = function() {
--
2.1.0
3:13 p.m.
New subject: [PATCH 2/2] UI - Implement multiple disks support in Template
- This patch implements necessary changes in frontend to allow
users to edit and add extra disks to a chosen Template.
- This patch also refactor the UI code in order to avoid lots
of backend calls, improving performance.
- Template disks data saved in objectstore have new fields:
* 'size' is always recorded, even for ISCSI/SCSI types;
* 'storagepooltype' is always recorded;
* example:
"disks":[
{ "index":0,
"format":"raw",
"storagepooltype":"iscsi",
"volume":"unit:0:0:2",
"storagepool":"/plugins/kimchi/storagepools/test-iscsi",
"size":7
},
{ "index":1,
"format":"qcow2",
"storagepooltype":"dir",
"storagepool":"/plugins/kimchi/storagepools/default",
"size":3
}
]
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
.../kimchi/ui/css/theme-default/template-edit.css | 1 +
.../kimchi/ui/js/src/kimchi.template_edit_main.js | 245 ++++++++++-----------
.../kimchi/ui/pages/template-edit.html.tmpl | 5 +-
3 files changed, 125 insertions(+), 126 deletions(-)
diff --git a/src/wok/plugins/kimchi/ui/css/theme-default/template-edit.css
b/src/wok/plugins/kimchi/ui/css/theme-default/template-edit.css
index 7c93117..cb33a78 100644
--- a/src/wok/plugins/kimchi/ui/css/theme-default/template-edit.css
+++ b/src/wok/plugins/kimchi/ui/css/theme-default/template-edit.css
@@ -129,6 +129,7 @@
#edit-template-tabs .template-tab-body .item {
height: 25px;
+ margin-bottom: 10px;
}
#form-template-interface .template-tab-body select {
diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
b/src/wok/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
index b4e9c69..96320b1 100644
--- a/src/wok/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
+++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.template_edit_main.js
@@ -65,139 +65,138 @@ kimchi.template_edit_main = function() {
return false;
}
enableSpice();
+
var initStorage = function(result) {
- var scsipools = {};
+ // Gather storage pool data
+ var storagePoolsInfo = new Object();
+ $.each(result, function(index, pool) {
+ if (pool.state === 'active' && pool.type !=
'kimchi-iso') {
+ if (pool.type === 'iscsi' || pool.type === 'scsi') {
+ volumes = new Object();
+ kimchi.listStorageVolumes(pool.name, function(vols) {
+ $.each(vols, function(i, vol) {
+ storagePoolsInfo[pool.name + "/" + vol.name] =
{
+ 'type' : pool.type,
+ 'volSize': vol.capacity / Math.pow(1024,
3)};
+ });
+ }, null, true);
+ } else {
+ storagePoolsInfo[pool.name] = { 'type' : pool.type };
+ }
+ }
+ });
+
var addStorageItem = function(storageData) {
var thisName = storageData.storageName;
+ // Compatibility with old versions
+ if (storageData.storageVolume) {
+ storageData.storageDisk = storagePoolsInfo[thisName].volSize;
+ }
+ if (!storageData.storageType) {
+ storageData.storageType = storagePoolsInfo[thisName].type;
+ }
+
var nodeStorage =
$.parseHTML(wok.substitute($('#template-storage-pool-tmpl').html(),
storageData));
$('.template-tab-body',
'#form-template-storage').append(nodeStorage);
+ var storageRow = '#storageRow' + storageData.storageIndex;
+
var storageOptions = '';
- var scsiOptions = '';
- $('#selectStorageName').find('option').remove();
- $.each(result, function(index, storageEntities) {
- if((storageEntities.state === 'active') &&
(storageEntities.type != 'kimchi-iso')) {
- if(storageEntities.type === 'iscsi' ||
storageEntities.type === 'scsi') {
- kimchi.listStorageVolumes(storageEntities.name,
function(currentVolume) {
- $.each(currentVolume, function(indexSCSI, scsiEntities)
{
- var tmpPath = storageEntities.name + '/' +
scsiEntities.name;
- var isSlected = tmpPath === thisName ? '
selected' : '';
- scsiOptions += '<option' + isSlected +
'>' + tmpPath + '</option>';
- });
- $('#selectStorageName').append(scsiOptions);
- }, function() {});
- } else {
- var isSlected = storageEntities.name === thisName ? '
selected' : '';
- storageOptions += '<option' + isSlected +
'>' + storageEntities.name + '</option>';
- }
- }
+ $.each(storagePoolsInfo, function(poolName, value) {
+ storageOptions += '<option value="' + poolName +
'">' + poolName + '</option>';
});
- $('#selectStorageName').append(storageOptions);
+
+ $(storageRow + ' #selectStorageName').append(storageOptions);
+ $(storageRow + '
#selectStorageName').val(storageData.storageName);
+
+ if (storageData.storageType === 'iscsi' ||
storageData.storageType === 'scsi') {
+ $(storageRow + '
.template-storage-disk').attr('readonly', true);
+ $(storageRow + ' #diskFormat').val('raw');
+ $(storageRow + ' #diskFormat').prop('disabled',
true).change();
+ } else if (storageData.storageType === 'logical') {
+ $(storageRow + ' #diskFormat').val('raw');
+ $(storageRow + ' #diskFormat').prop('disabled',
true).change();
+ }
// Set disk format
if (isImageBasedTemplate()) {
- $('#diskFormat').val('qcow2');
- $('#diskFormat').prop('disabled',
'disabled');
+ $(storageRow + ' #diskFormat').val('qcow2');
+ $(storageRow + ' #diskFormat').prop('disabled',
'disabled');
}
else {
- $('#diskFormat').val(storageData.storageDiskFormat);
- $('#diskFormat').on('change', function() {
- $('.template-storage-disk-format').val($(this).val());
+ $(storageRow + '
#diskFormat').val(storageData.storageDiskFormat);
+ $(storageRow + ' #diskFormat').on('change',
function() {
+ $(storageRow + '
.template-storage-disk-format').val($(this).val());
});
}
- $('#selectStorageName').change(function() {
- var selectedItem = $(this).parent().parent();
- var tempStorageNameFull = $(this).val();
- var tempName = tempStorageNameFull.split('/');
- var tempStorageName = tempName[0];
- $('.template-storage-name').val(tempStorageNameFull);
- kimchi.getStoragePool(tempStorageName, function(info) {
- tempType = info.type;
-
selectedItem.find('.template-storage-type').val(tempType);
- if (tempType === 'iscsi' || tempType === 'scsi')
{
- kimchi.getStoragePoolVolume(tempStorageName,
tempName[tempName.length-1], function(info) {
- volSize = info.capacity / Math.pow(1024, 3);
- $('.template-storage-disk',
selectedItem).attr('readonly', true).val(volSize);
- if (!isImageBasedTemplate()) {
- $('#diskFormat').val('raw');
- $('#diskFormat').prop('disabled',
true).change();
- }
- });
- } else if (tempType === 'logical') {
- $('.template-storage-disk',
selectedItem).attr('readonly', false);
- if (!isImageBasedTemplate()) {
- $('#diskFormat').val('raw');
- $('#diskFormat').prop('disabled',
true).change();
- }
- } else {
- $('.template-storage-disk',
selectedItem).attr('readonly', false);
- if ($('#diskFormat').prop('disabled') == true
&&
- !isImageBasedTemplate()) {
- $('#diskFormat').val('qcow2');
- $('#diskFormat').prop('disabled',
false).change();
- }
- }
- });
+ $('.delete', '#form-template-storage').button({
+ icons : {primary : 'ui-icon-trash'},
+ text : false
+ }).click(function(evt) {
+ evt.preventDefault();
+ $(this).parent().parent().remove();
});
- };
-
- if ((origDisks && origDisks.length) && (origPool &&
origPool.length)) {
- splitPool = origPool.split('/');
- var defaultPool = splitPool[splitPool.length-1];
- var defaultType;
- kimchi.getStoragePool(defaultPool, function(info) {
- defaultType = info.type;
- $.each(origDisks, function(index, diskEntities) {
- var storageNodeData = {
- viewMode : '',
- editMode : 'hide',
- storageName : defaultPool,
- storageType : defaultType,
- storageDisk : diskEntities.size,
- storageDiskFormat : diskEntities.format ? diskEntities.format
: 'qcow2'
+ $(storageRow + ' #selectStorageName').change(function() {
+ var poolType = storagePoolsInfo[$(this).val()].type;
+ $(storageRow + '
.template-storage-name').val($(this).val());
+ $(storageRow + ' .template-storage-type').val(poolType);
+ if (poolType === 'iscsi' || poolType === 'scsi') {
+ $(storageRow + '
.template-storage-disk').attr('readonly',
true).val(storagePoolsInfo[$(this).val()].volSize);
+ if (!isImageBasedTemplate()) {
+ $(storageRow + '
#diskFormat').val('raw').prop('disabled', true).change();
}
-
- if (diskEntities.volume) {
- kimchi.getStoragePoolVolume(defaultPool, diskEntities.volume,
function(info) {
- var volSize = info.capacity / Math.pow(1024, 3);
- var nodeData = storageNodeData
- nodeData.storageName = defaultPool + '/' +
diskEntities.volume;
- nodeData.storageDisk = volSize;
- addStorageItem(nodeData);
-
$('.template-storage-disk').attr('readonly', true);
- $('#diskFormat').val('raw');
- $('#diskFormat').prop('disabled',
true).change();
- });
- } else if (defaultType === 'logical') {
- addStorageItem(storageNodeData);
- $('#diskFormat').val('raw');
- $('#diskFormat').prop('disabled',
true).change();
- } else {
- addStorageItem(storageNodeData);
+ } else if (poolType === 'logical') {
+ $(storageRow + '
.template-storage-disk').attr('readonly', false);
+ if (!isImageBasedTemplate()) {
+ $(storageRow + '
#diskFormat').val('raw').prop('disabled', true).change();
}
- });
+ } else {
+ $(storageRow + '
.template-storage-disk').attr('readonly', false);
+ if ($(storageRow + '
#diskFormat').prop('disabled') == true && !isImageBasedTemplate()) {
+ $(storageRow + '
#diskFormat').val('qcow2').prop('disabled', false).change();
+ }
+ }
+ });
+ }; // End of addStorageItem funtion
+
+ if ((origDisks && origDisks.length) && (origPool &&
origPool.length)) {
+ origDisks.sort(function(a, b){return a.index-b.index});
+ $.each(origDisks, function(index, diskEntities) {
+ var defaultPool = diskEntities.storagepool ?
diskEntities.storagepool.split('/').pop() : origPool.split('/').pop()
+ var storageNodeData = {
+ storageIndex : diskEntities.index,
+ storageName : diskEntities.volume ? defaultPool + '/' +
diskEntities.volume : defaultPool,
+ storageType : diskEntities.storagepooltype,
+ storageDisk : diskEntities.size,
+ storageDiskFormat : diskEntities.format ? diskEntities.format :
'qcow2',
+ storageVolume : diskEntities.volume
+ }
+ addStorageItem(storageNodeData);
});
}
+ var storageID = origDisks.length -1;
$('#template-edit-storage-add-button').button({
icons: {
primary: "ui-icon-plusthick"
},
text: false,
- disabled: true
+ disabled: false
}).click(function(event) {
event.preventDefault();
+ storageID = storageID + 1;
var storageNodeData = {
- viewMode : 'hide',
- editMode : '',
- storageName : 'null',
+ storageName : 'default',
storageType : 'dir',
- storageDisk : '10'
+ storageDisk : '10',
+ storageDiskFormat : 'qcow2',
+ storageIndex : storageID
}
addStorageItem(storageNodeData);
});
};
+
var initInterface = function(result) {
var networkItemNum = 0;
var addInterfaceItem = function(networkData) {
@@ -286,36 +285,32 @@ kimchi.template_edit_main = function() {
};
kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate);
-
$('#tmpl-edit-button-save').on('click', function() {
- var editableFields = [ 'name', 'memory', 'disks',
'graphics'];
+ var editableFields = [ 'name', 'memory', 'graphics'];
var data = {};
- //Fix me: Only support one storage pool now
- var storages = $('.template-tab-body .item',
'#form-template-storage');
- var tempName = $('.template-storage-name', storages).val();
- var tmpItem = $('#form-template-storage .item');
- tempName = tempName.split('/');
- var tempNameHead = tempName[0];
- var tempNameTail = tempNameHead;
- if($('.template-storage-type', tmpItem).val() === 'iscsi' ||
$('.template-storage-type', tmpItem).val() == 'scsi') {
- tempNameTail = tempName[tempName.length-1];
- }
- tempName = '/plugins/kimchi/storagepools/' + tempNameHead;
- data['storagepool'] = tempName;
- $.each(editableFields, function(i, field) {
- /* Support only 1 disk at this moment */
- if (field == 'disks') {
- if($('.template-storage-type', tmpItem).val() === 'iscsi'
|| $('.template-storage-type', tmpItem).val() == 'scsi') {
- origDisks[0]['size'] && delete
origDisks[0]['size'];
- origDisks[0]['volume'] = tempNameTail;
- } else {
- origDisks[0]['volume'] && delete
origDisks[0]['volume'];
- origDisks[0].size = Number($('.template-storage-disk',
tmpItem).val());
- }
- origDisks[0].format = $('.template-storage-disk-format',
tmpItem).val();
- data[field] = origDisks;
+ var disks = $('.template-tab-body .item',
'#form-template-storage');
+ var disksForUpdate = new Array();
+ $.each(disks, function(index, diskEntity) {
+ var newDisk = {
+ 'index' : index,
+ 'storagepool' : '/plugins/kimchi/storagepools/' +
$(diskEntity).find('.template-storage-name').val(),
+ 'size' :
Number($(diskEntity).find('.template-storage-disk').val()),
+ 'format' :
$(diskEntity).find('.template-storage-disk-format').val()
+ };
+
+ var storageType =
$(diskEntity).find('.template-storage-type').val();
+ newDisk['storagepooltype'] = storageType;
+
+ if(storageType === 'iscsi' || storageType === 'scsi') {
+ newDisk['volume'] =
newDisk['storagepool'].split('/').pop();
+ newDisk['storagepool'] = newDisk['storagepool'].slice(0,
newDisk['storagepool'].lastIndexOf('/'));
}
- else if (field == 'graphics') {
+ disksForUpdate.push(newDisk);
+ });
+ data.disks = disksForUpdate;
+
+ $.each(editableFields, function(i, field) {
+ if (field == 'graphics') {
var type = $('#form-template-general [name="' + field +
'"]').val();
data[field] = {'type': type};
}
diff --git a/src/wok/plugins/kimchi/ui/pages/template-edit.html.tmpl
b/src/wok/plugins/kimchi/ui/pages/template-edit.html.tmpl
index aa7fd1a..e3d4b39 100644
--- a/src/wok/plugins/kimchi/ui/pages/template-edit.html.tmpl
+++ b/src/wok/plugins/kimchi/ui/pages/template-edit.html.tmpl
@@ -150,7 +150,7 @@
kimchi.template_edit_main();
</script>
<script id="template-storage-pool-tmpl" type="text/html">
- <div class='item'>
+ <div id="storageRow{storageIndex}" class='item'>
<span class="template-storage-cell">
<input class="template-storage-name" value={storageName}
type="text" style="display:none" />
<select id="selectStorageName"></select>
@@ -176,6 +176,9 @@
<option value="vpc">vpc</option>
</select>
</span>
+ <span class="action-area">
+ <button class="delete"></button>
+ </span>
</div>
</script>
<script id="template-interface-tmpl" type="text/html">
--
2.1.0
7:02 a.m.
This patch set needs to wait a little bit.
Samuel is going to send new UI patches today, so this patchset will need
rebase and some css adjustments
I am going to send a V2 as soon as I get new UI patches.
Thanks
Rodrigo
On 11/09/2015 08:13 PM, Rodrigo Trujillo wrote:
This patch changes kimchi.listStorageVolumes function to receive
a new parameter 'sync' in order to set it as synchronous call.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 7 ++++---
src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js | 2 +-
src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
b/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
index b1acdb9..d5e9ddd 100644
--- a/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
+++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
@@ -393,12 +393,13 @@ var kimchi = {
});
},
- listStorageVolumes : function(poolName, suc, err) {
+ listStorageVolumes : function(poolName, suc, err, sync) {
$.ajax({
url : 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName)
+ '/storagevolumes',
type : 'GET',
contentType : 'application/json',
dataType : 'json',
+ async : !sync,
success : suc,
error : err
});
@@ -452,7 +453,7 @@ var kimchi = {
return;
}
suc(isos, true);
- }, err);
+ }, err, false);
} else if (status === "running") {
if (deepScanHandler.stop) {
return;
@@ -463,7 +464,7 @@ var kimchi = {
}
suc(isos, false);
setTimeout(monitorTask, 2000);
- }, err);
+ }, err, false);
} else if (status === "failed") {
if (deepScanHandler.stop) {
return;
diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
b/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
index ec07cf0..d6606ee 100644
--- a/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
+++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
@@ -94,7 +94,7 @@ kimchi.guest_storage_add_main = function() {
}
}
$('#guest-disk').selectMenu("setData", options);
- });
+ }, null, false);
});
diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
b/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
index 40a43f6..cba8fb4 100644
--- a/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
+++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
@@ -282,7 +282,7 @@ kimchi.doListVolumes = function(poolObj) {
slide.slideDown('slow');
}, function(err) {
wok.message.error(err.responseJSON.reason);
- });
+ }, false);
}
kimchi.initLogicalPoolExtend = function() {
9:32 a.m.
On 10/11/2015 12:02, Rodrigo Trujillo wrote:
This patch set needs to wait a little bit.
Samuel is going to send new UI patches today, so this patchset will
need rebase and some css adjustments
I am going to send a V2 as soon as I get new UI patches.
OK, Rodrigo! So I will not consider this patch.
Thanks
Rodrigo
On 11/09/2015 08:13 PM, Rodrigo Trujillo wrote:
> This patch changes kimchi.listStorageVolumes function to receive
> a new parameter 'sync' in order to set it as synchronous call.
>
> Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
> ---
> src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 7 ++++---
> src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js | 2 +-
> src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js | 2 +-
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
> b/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
> index b1acdb9..d5e9ddd 100644
> --- a/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
> +++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js
> @@ -393,12 +393,13 @@ var kimchi = {
> });
> },
>
> - listStorageVolumes : function(poolName, suc, err) {
> + listStorageVolumes : function(poolName, suc, err, sync) {
> $.ajax({
> url : 'plugins/kimchi/storagepools/' +
> encodeURIComponent(poolName) + '/storagevolumes',
> type : 'GET',
> contentType : 'application/json',
> dataType : 'json',
> + async : !sync,
> success : suc,
> error : err
> });
> @@ -452,7 +453,7 @@ var kimchi = {
> return;
> }
> suc(isos, true);
> - }, err);
> + }, err, false);
> } else if (status === "running") {
> if (deepScanHandler.stop) {
> return;
> @@ -463,7 +464,7 @@ var kimchi = {
> }
> suc(isos, false);
> setTimeout(monitorTask, 2000);
> - }, err);
> + }, err, false);
> } else if (status === "failed") {
> if (deepScanHandler.stop) {
> return;
> diff --git
> a/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
> b/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
> index ec07cf0..d6606ee 100644
> --- a/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
> +++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js
> @@ -94,7 +94,7 @@ kimchi.guest_storage_add_main = function() {
> }
> }
> $('#guest-disk').selectMenu("setData", options);
> - });
> + }, null, false);
> });
>
>
> diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
> b/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
> index 40a43f6..cba8fb4 100644
> --- a/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
> +++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js
> @@ -282,7 +282,7 @@ kimchi.doListVolumes = function(poolObj) {
> slide.slideDown('slow');
> }, function(err) {
> wok.message.error(err.responseJSON.reason);
> - });
> + }, false);
> }
>
> kimchi.initLogicalPoolExtend = function() {
_______________________________________________
Kimchi-devel mailing list
Kimchi-devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel
3084
days inactive
3088
days old
3 comments
2 participants
participants (2)
-
Aline Manera -
Rodrigo Trujillo