10:34 a.m.
From: Rajat Gupta <rajat.triumph(a)gmail.com>
Rajat Gupta (2):
Fixed issue #1075 s390x : Edit Template storage tab Storage dropdown
shows "default" text
Fixed issue #1076 s390x : n/w shows twice same interface while adding
for template
ui/js/src/kimchi.template_edit_main.js | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
--
2.1.0
10:34 a.m.
New subject: [PATCH] [Kimchi 1/2] Fixed issue #1075 s390x : Edit Template storage tab Storage dropdown shows "default" text
From: Rajat Gupta <rajat.triumph(a)gmail.com>
1. Removed hard code value "default" for storage dropdown
2. Initialize drop down with blank option
3. apply value to storage drop down and validate
Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com>
---
ui/js/src/kimchi.template_edit_main.js | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/ui/js/src/kimchi.template_edit_main.js
b/ui/js/src/kimchi.template_edit_main.js
index 1a6e473..9992c93 100644
--- a/ui/js/src/kimchi.template_edit_main.js
+++ b/ui/js/src/kimchi.template_edit_main.js
@@ -278,19 +278,17 @@ kimchi.template_edit_main = function() {
$('.template-tab-body',
'#form-template-storage').append(nodeStorage);
var storageRow = '#storageRow' + storageData.storageIndex;
- var storageOptions = '';
+ var storageOptions = '<option disabled="disabled"
selected="selected" value=""></option>';
$.each(storagePoolsInfo, function(poolName, value) {
storageOptions += '<option value="' + poolName +
'">' + poolName + '</option>';
});
$(storageRow + ' .selectStorageName').append(storageOptions);
if (storageData.storageSource == 'pool') {
- if (!$(storageRow + ' .selectStorageName option[value="'
+ storageData.storageName + '"]').length) {
- var invalidOption = '<option disabled="disabled"
selected="selected" value="' + storageData.storageName +
'">' + storageData.storageName + '</option>';
- $(storageRow + '
.selectStorageName').prepend(invalidOption);
- $(storageRow + '
.selectStorageName').parent().addClass('has-error')
- }
$(storageRow + '
.selectStorageName').val(storageData.storageName);
+ if(!storageData.storageName){
+ $(storageRow + '
.selectStorageName').parent().addClass('has-error');
+ }
$(storageRow + ' span.storage-pool').show();
$(storageRow + ' span.storage-path').hide();
} else {
@@ -427,7 +425,7 @@ kimchi.template_edit_main = function() {
storageID = storageID + 1;
var storageNodeData = {
storageSource: 'pool',
- storageName: 'default',
+ storageName: '',
storageType: 'dir',
storageDisk: '10',
storageDiskFormat: 'qcow2',
--
2.1.0
1:05 p.m.
New subject: [PATCH] [Kimchi 1/2] Fixed issue #1075 s390x : Edit Template storage tab Storage dropdown shows "default" text
Reviewed-By: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
On 08/11/2016 06:34, rajgupta(a)linux.vnet.ibm.com wrote:
From: Rajat Gupta <rajat.triumph(a)gmail.com>
1. Removed hard code value "default" for storage dropdown
2. Initialize drop down with blank option
3. apply value to storage drop down and validate
Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com>
---
ui/js/src/kimchi.template_edit_main.js | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/ui/js/src/kimchi.template_edit_main.js
b/ui/js/src/kimchi.template_edit_main.js
index 1a6e473..9992c93 100644
--- a/ui/js/src/kimchi.template_edit_main.js
+++ b/ui/js/src/kimchi.template_edit_main.js
@@ -278,19 +278,17 @@ kimchi.template_edit_main = function() {
$('.template-tab-body',
'#form-template-storage').append(nodeStorage);
var storageRow = '#storageRow' + storageData.storageIndex;
- var storageOptions = '';
+ var storageOptions = '<option disabled="disabled"
selected="selected" value=""></option>';
$.each(storagePoolsInfo, function(poolName, value) {
storageOptions += '<option value="' + poolName +
'">' + poolName + '</option>';
});
$(storageRow + ' .selectStorageName').append(storageOptions);
if (storageData.storageSource == 'pool') {
- if (!$(storageRow + ' .selectStorageName
option[value="' + storageData.storageName + '"]').length) {
- var invalidOption = '<option
disabled="disabled" selected="selected" value="' +
storageData.storageName + '">' + storageData.storageName +
'</option>';
- $(storageRow + '
.selectStorageName').prepend(invalidOption);
- $(storageRow + '
.selectStorageName').parent().addClass('has-error')
- }
$(storageRow + '
.selectStorageName').val(storageData.storageName);
+ if(!storageData.storageName){
+ $(storageRow + '
.selectStorageName').parent().addClass('has-error');
+ }
$(storageRow + ' span.storage-pool').show();
$(storageRow + ' span.storage-path').hide();
} else {
@@ -427,7 +425,7 @@ kimchi.template_edit_main = function() {
storageID = storageID + 1;
var storageNodeData = {
storageSource: 'pool',
- storageName: 'default',
+ storageName: '',
storageType: 'dir',
storageDisk: '10',
storageDiskFormat: 'qcow2',
--
Lucio Correia
Software Engineer
IBM LTC Brazil
10:34 a.m.
New subject: [PATCH] [Kimchi 2/2] Fixed issue #1076 s390x : n/w shows twice same interface while adding for template
From: Rajat Gupta <rajat.triumph(a)gmail.com>
fixed issue #1076 s390x : while editing template and adding an interface,
drop down for Network should show unique interfaces no repeats.
Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com>
---
ui/js/src/kimchi.template_edit_main.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ui/js/src/kimchi.template_edit_main.js
b/ui/js/src/kimchi.template_edit_main.js
index 9992c93..5ec2b64 100644
--- a/ui/js/src/kimchi.template_edit_main.js
+++ b/ui/js/src/kimchi.template_edit_main.js
@@ -558,8 +558,9 @@ kimchi.template_edit_main = function() {
for (var i = 0; i < origmacvtapNetworks.length; i++) {
if (networkName === origmacvtapNetworks[i].name) {
networkOptions += '<option
selected="selected">' + origmacvtapNetworks[i].name +
'</option>';
+ }else{
+ networkOptions += '<option>' +
origmacvtapNetworks[i].name + '</option>';
}
- networkOptions += '<option>' +
origmacvtapNetworks[i].name + '</option>';
}
$('select', '#form-template-interface-s390x
#networkID' + networkItemNum + ' span.network').append(networkOptions);
@@ -576,8 +577,9 @@ kimchi.template_edit_main = function() {
for (var i = 0; i < origovsNetworks.length; i++) {
if (networkName === origovsNetworks[i]) {
networkOptions += '<option
selected="selected">' + origovsNetworks[i] + '</option>';
+ }else{
+ networkOptions += '<option>' +
origovsNetworks[i] + '</option>';
}
- networkOptions += '<option>' +
origovsNetworks[i] + '</option>';
}
$('select', '#form-template-interface-s390x
#networkID' + networkItemNum + ' span.network').append(networkOptions);
@@ -591,8 +593,7 @@ kimchi.template_edit_main = function() {
for (var i = 0; i < result.length; i++) {
if (networkName === result[i].name) {
networkOptions += '<option
selected="selected">' + result[i].name + '</option>';
- }
- if (result[i].state === "active" &&
networkName !== result[i].name) {
+ }else if (result[i].state === "active" &&
networkName !== result[i].name) {
networkOptions += '<option>' +
result[i].name + '</option>';
}
}
--
2.1.0
1:09 p.m.
New subject: [PATCH] [Kimchi 2/2] Fixed issue #1076 s390x : n/w shows twice same interface while adding for template
On 08/11/2016 06:34, rajgupta(a)linux.vnet.ibm.com wrote:
From: Rajat Gupta <rajat.triumph(a)gmail.com>
fixed issue #1076 s390x : while editing template and adding an interface,
drop down for Network should show unique interfaces no repeats.
Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com>
---
ui/js/src/kimchi.template_edit_main.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ui/js/src/kimchi.template_edit_main.js
b/ui/js/src/kimchi.template_edit_main.js
index 9992c93..5ec2b64 100644
--- a/ui/js/src/kimchi.template_edit_main.js
+++ b/ui/js/src/kimchi.template_edit_main.js
@@ -558,8 +558,9 @@ kimchi.template_edit_main = function() {
for (var i = 0; i < origmacvtapNetworks.length; i++) {
if (networkName === origmacvtapNetworks[i].name) {
networkOptions += '<option
selected="selected">' + origmacvtapNetworks[i].name +
'</option>';
+ }else{
+ networkOptions += '<option>' +
origmacvtapNetworks[i].name + '</option>';
}
- networkOptions += '<option>' +
origmacvtapNetworks[i].name + '</option>';
}
$('select', '#form-template-interface-s390x
#networkID' + networkItemNum + ' span.network').append(networkOptions);
@@ -576,8 +577,9 @@ kimchi.template_edit_main = function() {
for (var i = 0; i < origovsNetworks.length; i++) {
if (networkName === origovsNetworks[i]) {
networkOptions += '<option
selected="selected">' + origovsNetworks[i] + '</option>';
+ }else{
+ networkOptions += '<option>' +
origovsNetworks[i] + '</option>';
}
- networkOptions += '<option>' +
origovsNetworks[i] + '</option>';
}
$('select', '#form-template-interface-s390x
#networkID' + networkItemNum + ' span.network').append(networkOptions);
@@ -591,8 +593,7 @@ kimchi.template_edit_main = function() {
for (var i = 0; i < result.length; i++) {
if (networkName === result[i].name) {
networkOptions += '<option
selected="selected">' + result[i].name + '</option>';
- }
- if (result[i].state === "active" &&
networkName !== result[i].name) {
+ }else if (result[i].state === "active" &&
networkName !== result[i].name) {
You don't need the second test (networkName !== result[i].name) since
"else" implies it.
networkOptions +=
'<option>' + result[i].name + '</option>';
}
}
--
Lucio Correia
Software Engineer
IBM LTC Brazil
2937
days inactive
2937
days old
4 comments
2 participants
participants (2)
-
Lucio Correia -
rajgupta＠linux.vnet.ibm.com