diff --git a/xCAT-UI/js/configure/service.js b/xCAT-UI/js/configure/service.js index 376ed0148..00a4fb9ea 100644 --- a/xCAT-UI/js/configure/service.js +++ b/xCAT-UI/js/configure/service.js @@ -62,7 +62,7 @@ function loadServicePage(tabId) { // Get zVM host names if (!$.cookie('zvms')){ $.ajax( { - url : 'lib/srv_cmd.php', + url : 'lib/cmd.php', dataType : 'json', data : { cmd : 'webportal', @@ -487,8 +487,15 @@ function imageDialog() { * @param iComments Image description */ function editImageDialog(iName, iSelectable, iOsVersion, iOsArch, iOsName, iType, iProfile, iMethod, iComments) { - // Create form to add profile - var dialogId = 'editImage'; + var inst = 0; + var dialogId = 'editImage' + inst; + while ($('#' + dialogId).length) { + // If one already exists, generate another one + inst = inst + 1; + dialogId = 'editImage' + inst; + } + + // Create form to add profile var imageForm = $('
'); // Create info bar @@ -529,7 +536,7 @@ function editImageDialog(iName, iSelectable, iOsVersion, iOsArch, iOsName, iType imageForm.find('div input[title],textarea[title],select[title]').tooltip({ position: "center right", offset: [-2, 10], - effect: "fade", + effect: "toggle", opacity: 0.8, delay: 0, predelay: 800, @@ -1019,7 +1026,7 @@ function groupDialog() { */ function editGroupDialog(iGroup, iSelectable, iIp, iHostnames, iNetwork, iComments) { // Create form to add profile - var dialogId = 'createGroup'; + var dialogId = 'createGroup-' + iGroup; var groupForm = $('
'); // Create info bar @@ -1047,7 +1054,7 @@ function editGroupDialog(iGroup, iSelectable, iIp, iHostnames, iNetwork, iCommen groupForm.find('div input[title],textarea[title],select[title]').tooltip({ position: "center right", offset: [-2, 10], - effect: "fade", + effect: "toggle", opacity: 0.8, delay: 0, predelay: 800, diff --git a/xCAT-UI/js/custom/zvmUtils.js b/xCAT-UI/js/custom/zvmUtils.js index 0df7bd9e1..9a1653591 100644 --- a/xCAT-UI/js/custom/zvmUtils.js +++ b/xCAT-UI/js/custom/zvmUtils.js @@ -6191,7 +6191,7 @@ function editProfileDialog(profile, pool, size, entry) { profileForm.find('div input[title],textarea[title],select[title]').tooltip({ position: "center right", offset: [-2, 10], - effect: "fade", + effect: "toggle", opacity: 0.8, delay: 0, predelay: 800, diff --git a/xCAT-UI/js/service/service.js b/xCAT-UI/js/service/service.js index 0b545debd..9cae5e602 100644 --- a/xCAT-UI/js/service/service.js +++ b/xCAT-UI/js/service/service.js @@ -114,47 +114,45 @@ function loadServicePage() { } }); + // Get OS image names + $.ajax({ + url : 'lib/srv_cmd.php', + dataType : 'json', + async : true, + data : { + cmd : 'tabdump', + tgt : '', + args : 'osimage', + msg : '' + }, + + success : function(data) { + setOSImageCookies(data); + } + }); + + // Get contents of hosts table + $.ajax({ + url : 'lib/srv_cmd.php', + dataType : 'json', + async : true, + data : { + cmd : 'tabdump', + tgt : '', + args : 'hosts', + msg : '' + }, + + success : function(data) { + setGroupCookies(data); + } + }); + var provTabId = 'provisionTab'; serviceTabs.add(provTabId, 'Provision', '', false); loadServiceProvisionPage(provTabId); serviceTabs.select(manageTabId); - - // Get OS image names - if (!$.cookie('srv_imagenames')){ - $.ajax( { - url : 'lib/srv_cmd.php', - dataType : 'json', - data : { - cmd : 'tabdump', - tgt : '', - args : 'osimage', - msg : '' - }, - - success : function(data) { - setOSImageCookies(data); - } - }); - } - - // Get contents of hosts table - if (!$.cookie('srv_groups')) { - $.ajax( { - url : 'lib/srv_cmd.php', - dataType : 'json', - data : { - cmd : 'tabdump', - tgt : '', - args : 'hosts', - msg : '' - }, - - success : function(data) { - setGroupCookies(data); - } - }); - } } /**