Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.storage_main.js | 6 +++---
ui/js/src/kimchi.storagepool_add_volume_main.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js
index 29ee365..1a711ce 100644
--- a/ui/js/src/kimchi.storage_main.js
+++ b/ui/js/src/kimchi.storage_main.js
@@ -450,7 +450,7 @@ kimchi.storage_main = function() {
};
var uriElements = result.target_uri.split('/');
- var poolName = uriElements[2];
+ var poolName = uriElements[4];
var volumeName = uriElements.pop();
var progress = extractProgressData(result['message']);
var size = progress['size'];
@@ -467,7 +467,7 @@ kimchi.storage_main = function() {
wok.topic('kimchi/volumeTransferFinished').subscribe(function(result) {
var uriElements = result.target_uri.split('/');
- var poolName = uriElements[2];
+ var poolName = uriElements[4];
var volumeName = uriElements.pop();
var volumeBox = $('#volume' + poolName + '
[data-volume-name="' + volumeName + '"]');
$('.volume-progress', volumeBox).addClass('hidden');
@@ -491,7 +491,7 @@ kimchi.storage_main = function() {
result && wok.message.error(errText);
var uriElements = result.target_uri.split('/');
- var poolName = uriElements[2];
+ var poolName = uriElements[4];
var volumeName = uriElements.pop();
volumeBox = $('#volume' + poolName + ' [data-volume-name="'
+ volumeName + '"]');
$('.progress-status', volumeBox).text(i18n['KCHPOOL6015M']);
diff --git a/ui/js/src/kimchi.storagepool_add_volume_main.js
b/ui/js/src/kimchi.storagepool_add_volume_main.js
index d13977d..a1a8306 100644
--- a/ui/js/src/kimchi.storagepool_add_volume_main.js
+++ b/ui/js/src/kimchi.storagepool_add_volume_main.js
@@ -175,6 +175,6 @@ kimchi.sp_add_volume_main = function() {
uploadFile();
}
event.preventDefault();
- $('#modalWindow').modal("hide");
+ $('#modalWindow').modal.close();
});
};
--
1.9.1