9:10 a.m.
I forgot to comment before, but the deletion confirmation is not
necessary as the LVM data will not be changed.
Could you remove it, please? Only when the logical pool is created from
an existing LVM.
On 02/23/2016 09:51 AM, peterpnns(a)gmail.com wrote:
From: peterpennings <peterpnns(a)gmail.com>
Signed-off-by: peterpennings <peterpnns(a)gmail.com>
---
ui/js/src/kimchi.storagepool_add_main.js | 8 ++++----
ui/pages/i18n.json.tmpl | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ui/js/src/kimchi.storagepool_add_main.js
b/ui/js/src/kimchi.storagepool_add_main.js
index a1b2aeb..3ba4bc9 100644
--- a/ui/js/src/kimchi.storagepool_add_main.js
+++ b/ui/js/src/kimchi.storagepool_add_main.js
@@ -158,7 +158,7 @@ kimchi.initStorageAddPage = function() {
listHtml += '</tbody></table>';
$('.lvm-partition').html(listHtml);
} else {
- $('.lvm-partition').html(i18n['KCHPOOL6011M']);
+ $('.lvm-partition').html(i18n['KCHPOOL6016M']);
$('.lvm-partition').addClass('text-help');
}
}, function(err) {
@@ -443,8 +443,8 @@ kimchi.addPool = function(event) {
formData.path = $('#pathId').val();
} else if (poolType === 'logical') {
var logicalrRadioSelected =
$("input[name='logicalRadioSelection']:checked").val();
+ var source = {};
if (logicalrRadioSelected === 'rawDisk') {
- var source = {};
if (!$.isArray(formData.devices)) {
var deviceObj = [];
deviceObj[0] = formData.devices;
@@ -453,10 +453,10 @@ kimchi.addPool = function(event) {
source.devices = formData.devices;
}
delete formData.devices;
- formData.source = source;
} else if (logicalrRadioSelected === 'existingLvm') {
- formData.from_vg = true;
+ source.from_vg = true;
}
+ formData.source = source;
} else if (poolType === 'netfs'){
var source = {};
source.path = $('#nfspathId').val();
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
index 1e34183..2483422 100644
--- a/ui/pages/i18n.json.tmpl
+++ b/ui/pages/i18n.json.tmpl
@@ -102,6 +102,7 @@
"KCHPOOL6013M": "$_("Unable to retrieve partitions
information.")",
"KCHPOOL6014M": "$_("In progress...")",
"KCHPOOL6015M": "$_("Failed!")",
+ "KCHPOOL6016M": "$_("No LVM found in the system.")",
"KCHVMSTOR0001E": "$_("CDROM path needs to be a valid
local/remote path and cannot be blank.")",
"KCHVMSTOR0002E": "$_("Disk pool or volume cannot be
blank.")"