arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed synchronization issue on self-service page.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15165 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2013-02-13 17:24:39 +00:00
parent 4da96c27a3
commit 4a3919e899
3 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-UI/js/configure/service.js
View File

@ -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 = $('<div id="' + dialogId + '" class="form"></div>');
// 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 = $('<div id="' + dialogId + '" class="form"></div>');
// 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,

2
xCAT-UI/js/custom/zvmUtils.js
View File

@ -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,

70
xCAT-UI/js/service/service.js
View File

@ -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);
}
});
}
}
/**