Changed cookie naming.
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8232 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
78af0a63cb
commit
faaeb1caea
@ -131,7 +131,7 @@ function createProvisionExisting(plugin, inst) {
|
||||
|
||||
// Turn on auto complete for group
|
||||
var dTableDivId = plugin + 'NodesDatatableDIV' + inst; // Division ID where nodes datatable will be appended
|
||||
var groupNames = $.cookie('Groups');
|
||||
var groupNames = $.cookie('groups');
|
||||
if (groupNames) {
|
||||
// Split group names into an array
|
||||
var tmp = groupNames.split(',');
|
||||
@ -201,7 +201,7 @@ function createProvisionExisting(plugin, inst) {
|
||||
var osLabel = $('<label for="os">Operating system:</label>');
|
||||
var osInput = $('<input type="text" name="os"/>');
|
||||
osInput.one('focus', function() {
|
||||
var tmp = $.cookie('OSVers');
|
||||
var tmp = $.cookie('osvers');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
@ -216,7 +216,7 @@ function createProvisionExisting(plugin, inst) {
|
||||
var archLabel = $('<label for="arch">Architecture:</label>');
|
||||
var archInput = $('<input type="text" name="arch"/>');
|
||||
archInput.one('focus', function() {
|
||||
var tmp = $.cookie('OSArchs');
|
||||
var tmp = $.cookie('osarchs');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
@ -231,7 +231,7 @@ function createProvisionExisting(plugin, inst) {
|
||||
var profileLabel = $('<label for="profile">Profile:</label>');
|
||||
var profileInput = $('<input type="text" name="profile"/>');
|
||||
profileInput.one('focus', function() {
|
||||
var tmp = $.cookie('Profiles');
|
||||
var tmp = $.cookie('profiles');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
@ -274,7 +274,7 @@ function createProvisionNew(plugin, inst) {
|
||||
var groupLabel = $('<label for="group">Group:</label>');
|
||||
var groupInput = $('<input type="text" name="group"/>');
|
||||
groupInput.one('focus', function() {
|
||||
var groupNames = $.cookie('Groups');
|
||||
var groupNames = $.cookie('groups');
|
||||
if (groupNames) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(groupNames.split(','));
|
||||
@ -315,7 +315,7 @@ function createProvisionNew(plugin, inst) {
|
||||
var osLabel = $('<label for="os">Operating system:</label>');
|
||||
var osInput = $('<input type="text" name="os"/>');
|
||||
osInput.one('focus', function() {
|
||||
var tmp = $.cookie('OSVers');
|
||||
var tmp = $.cookie('osvers');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
@ -330,7 +330,7 @@ function createProvisionNew(plugin, inst) {
|
||||
var archLabel = $('<label for="arch">Architecture:</label>');
|
||||
var archInput = $('<input type="text" name="arch"/>');
|
||||
archInput.one('focus', function() {
|
||||
var tmp = $.cookie('OSArchs');
|
||||
var tmp = $.cookie('osarchs');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
@ -345,7 +345,7 @@ function createProvisionNew(plugin, inst) {
|
||||
var profileLabel = $('<label for="profile">Profile:</label>');
|
||||
var profileInput = $('<input type="text" name="profile"/>');
|
||||
profileInput.one('focus', function() {
|
||||
var tmp = $.cookie('Profiles');
|
||||
var tmp = $.cookie('profiles');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
|
@ -69,7 +69,7 @@ zvmPlugin.prototype.loadClonePage = function(node) {
|
||||
var groupLabel = $('<label for="group">Group:</label>');
|
||||
var groupInput = $('<input type="text" id="newGroup" name="newGroup" title="You must give the group where the new node(s) will be placed under."/>');
|
||||
groupInput.one('focus', function(){
|
||||
var groupNames = $.cookie('Groups');
|
||||
var groupNames = $.cookie('groups');
|
||||
if (groupNames) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(groupNames.split(','));
|
||||
@ -81,7 +81,7 @@ zvmPlugin.prototype.loadClonePage = function(node) {
|
||||
|
||||
// Get list of disk pools
|
||||
var temp = hcp.split('.');
|
||||
var diskPools = $.cookie(temp[0] + 'DiskPools');
|
||||
var diskPools = $.cookie(temp[0] + 'diskpools');
|
||||
|
||||
// Create disk pool input
|
||||
var poolDiv = $('<div></div>');
|
||||
|
@ -317,13 +317,13 @@ function loadUserEntry(data) {
|
||||
*/
|
||||
function incrementNodeProcess(node) {
|
||||
// Get current processes
|
||||
var procs = $.cookie(node + 'Processes');
|
||||
var procs = $.cookie(node + 'processes');
|
||||
if (procs) {
|
||||
// One more process
|
||||
procs = parseInt(procs) + 1;
|
||||
$.cookie(node + 'Processes', procs);
|
||||
$.cookie(node + 'processes', procs);
|
||||
} else {
|
||||
$.cookie(node + 'Processes', 1);
|
||||
$.cookie(node + 'processes', 1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -478,7 +478,7 @@ function updateZProvisionNewStatus(data) {
|
||||
|
||||
// Set cookie for number of disks
|
||||
var diskRows = $('#' + tabId + ' table:visible tr');
|
||||
$.cookie('zProvisionDisks2Add' + out2Id, diskRows.length);
|
||||
$.cookie('disks2add' + out2Id, diskRows.length);
|
||||
if (diskRows.length > 0) {
|
||||
for ( var i = 0; i < diskRows.length; i++) {
|
||||
// Get disk type, address, size, mode, pool, and password
|
||||
@ -546,7 +546,7 @@ function updateZProvisionNewStatus(data) {
|
||||
|
||||
// Set cookie for number of disks
|
||||
var diskRows = $('#' + tabId + ' table:visible tr');
|
||||
$.cookie('zProvisionDisks2Add' + out2Id, diskRows.length);
|
||||
$.cookie('disks2add' + out2Id, diskRows.length);
|
||||
if (diskRows.length > 0) {
|
||||
for ( var i = 0; i < diskRows.length; i++) {
|
||||
// Get disk type, address, size, pool, and password
|
||||
@ -599,11 +599,11 @@ function updateZProvisionNewStatus(data) {
|
||||
var osImage = $('#' + tabId + ' input[name=os]:visible').val();
|
||||
|
||||
// Get cookie for number of disks
|
||||
var disks2add = $.cookie('zProvisionDisks2Add' + out2Id);
|
||||
var disks2add = $.cookie('disks2add' + out2Id);
|
||||
// One less disk to add
|
||||
disks2add = disks2add - 1;
|
||||
// Set cookie for number of disks
|
||||
$.cookie('zProvisionDisks2Add' + out2Id, disks2add);
|
||||
$.cookie('disks2add' + out2Id, disks2add);
|
||||
|
||||
// If an operating system image is given
|
||||
if (osImage) {
|
||||
@ -835,10 +835,10 @@ function updateZNodeStatus(data) {
|
||||
var rsp = data.rsp;
|
||||
|
||||
// Get cookie for number processes performed against this node
|
||||
var actions = $.cookie(node + 'Processes');
|
||||
var actions = $.cookie(node + 'processes');
|
||||
// One less process
|
||||
actions = actions - 1;
|
||||
$.cookie(node + 'Processes', actions);
|
||||
$.cookie(node + 'processes', actions);
|
||||
|
||||
if (actions < 1) {
|
||||
// Hide loader when there are no more processes
|
||||
@ -1057,7 +1057,7 @@ function getZResources(data) {
|
||||
}
|
||||
|
||||
// Set cookie
|
||||
$.cookie('HCP', hcps);
|
||||
$.cookie('hcp', hcps);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1207,7 +1207,7 @@ function openAddProcDialog(node) {
|
||||
*/
|
||||
function openAddDiskDialog(node, hcp) {
|
||||
// Get list of disk pools
|
||||
var cookie = $.cookie(hcp + 'DiskPools');
|
||||
var cookie = $.cookie(hcp + 'diskpools');
|
||||
var pools = cookie.split(',');
|
||||
|
||||
// Create form to add disk
|
||||
@ -1344,7 +1344,7 @@ function openAddDiskDialog(node, hcp) {
|
||||
*/
|
||||
function openAddNicDialog(node, hcp) {
|
||||
// Get network names
|
||||
var networks = $.cookie(hcp + 'Networks').split(',');
|
||||
var networks = $.cookie(hcp + 'networks').split(',');
|
||||
|
||||
// Create form to add NIC
|
||||
var addNicForm = $('<div class="form"></div>');
|
||||
@ -1692,7 +1692,7 @@ function setDiskPoolCookies(data) {
|
||||
if (data.rsp) {
|
||||
var node = data.msg;
|
||||
var pools = data.rsp[0].split(node + ': ');
|
||||
$.cookie(node + 'DiskPools', pools);
|
||||
$.cookie(node + 'diskpools', pools);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1707,7 +1707,7 @@ function setNetworkCookies(data) {
|
||||
if (data.rsp) {
|
||||
var node = data.msg;
|
||||
var networks = data.rsp[0].split(node + ': ');
|
||||
$.cookie(node + 'Networks', networks);
|
||||
$.cookie(node + 'networks', networks);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2006,7 +2006,7 @@ function createZProvisionExisting(inst) {
|
||||
group.append(groupLabel);
|
||||
|
||||
// Turn on auto complete for group
|
||||
var groupNames = $.cookie('Groups');
|
||||
var groupNames = $.cookie('groups');
|
||||
if (groupNames) {
|
||||
// Split group names into an array
|
||||
var tmp = groupNames.split(',');
|
||||
@ -2051,7 +2051,7 @@ function createZProvisionExisting(inst) {
|
||||
var osInput = $('<input type="text" name="os" title="You must give the operating system to install on this node or node range, e.g. rhel5.5-s390x-install-compute"/>');
|
||||
// Get image names on focus
|
||||
osInput.one('focus', function(){
|
||||
var imageNames = $.cookie('ImageNames');
|
||||
var imageNames = $.cookie('imagenames');
|
||||
if (imageNames) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(imageNames.split(','));
|
||||
@ -2184,7 +2184,7 @@ function createZProvisionNew(inst) {
|
||||
var groupInput = $('<input type="text" name="group" title="You must give the group name that the node(s) will be placed under"/>');
|
||||
// Get groups on-focus
|
||||
groupInput.one('focus', function(){
|
||||
var groupNames = $.cookie('Groups');
|
||||
var groupNames = $.cookie('groups');
|
||||
if (groupNames) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(groupNames.split(','));
|
||||
@ -2239,7 +2239,7 @@ function createZProvisionNew(inst) {
|
||||
var osInput = $('<input type="text" name="os" title="You must give the operating system to install on this node or node range, e.g. rhel5.5-s390x-install-compute"/>');
|
||||
// Get image names on focus
|
||||
osInput.one('focus', function(){
|
||||
var imageNames = $.cookie('ImageNames');
|
||||
var imageNames = $.cookie('imagenames');
|
||||
if (imageNames) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(imageNames.split(','));
|
||||
@ -2322,7 +2322,7 @@ function createZProvisionNew(inst) {
|
||||
if (thisHcp) {
|
||||
// Get node without domain name
|
||||
var temp = thisHcp.split('.');
|
||||
definedPools = $.cookie(temp[0] + 'DiskPools');
|
||||
definedPools = $.cookie(temp[0] + 'diskpools');
|
||||
}
|
||||
|
||||
// Create disk pool input
|
||||
|
@ -300,7 +300,7 @@ function loadNodes(data) {
|
||||
|
||||
// Clear cookie containing list of nodes where
|
||||
// their attributes need to be updated
|
||||
$.cookie('Nodes2Update', '');
|
||||
$.cookie('nodes2update', '');
|
||||
// Clear hash table containing node attributes
|
||||
origAttrs = '';
|
||||
|
||||
@ -1538,28 +1538,28 @@ function setOSImageCookies(data) {
|
||||
}
|
||||
|
||||
// Save image names in a cookie
|
||||
$.cookie('ImageNames', imageNames);
|
||||
$.cookie('imagenames', imageNames);
|
||||
|
||||
// Save profiles in a cookie
|
||||
var tmp = new Array;
|
||||
for ( var key in profilesHash) {
|
||||
tmp.push(key);
|
||||
}
|
||||
$.cookie('Profiles', tmp);
|
||||
$.cookie('profiles', tmp);
|
||||
|
||||
// Save OS versions in a cookie
|
||||
tmp = [];
|
||||
for ( var key in osVersHash) {
|
||||
tmp.push(key);
|
||||
}
|
||||
$.cookie('OSVers', tmp);
|
||||
$.cookie('osvers', tmp);
|
||||
|
||||
// Save OS architectures in a cookie
|
||||
tmp = [];
|
||||
for ( var key in osArchsHash) {
|
||||
tmp.push(key);
|
||||
}
|
||||
$.cookie('OSArchs', tmp);
|
||||
$.cookie('osarchs', tmp);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1571,7 +1571,7 @@ function setOSImageCookies(data) {
|
||||
*/
|
||||
function setGroupsCookies(data) {
|
||||
var rsp = data.rsp;
|
||||
$.cookie('Groups', rsp);
|
||||
$.cookie('groups', rsp);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1729,13 +1729,13 @@ function loadRconsPage(tgtNodes){
|
||||
*/
|
||||
function flagNode2Update(node) {
|
||||
// Get list containing current nodes to update
|
||||
var nodes = $.cookie('Nodes2Update');
|
||||
var nodes = $.cookie('nodes2update');
|
||||
|
||||
// If the node is not in the list
|
||||
if (nodes.indexOf(node) == -1) {
|
||||
// Add the new node to list
|
||||
nodes += node + ';';
|
||||
$.cookie('Nodes2Update', nodes);
|
||||
$.cookie('nodes2update', nodes);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1756,7 +1756,7 @@ function updateNodeAttrs(group) {
|
||||
var headers = $('#nodesDataTable thead tr th');
|
||||
|
||||
// Get list of nodes to update
|
||||
var nodesList = $.cookie('Nodes2Update');
|
||||
var nodesList = $.cookie('nodes2update');
|
||||
var nodes = nodesList.split(';');
|
||||
|
||||
// Create the arguments
|
||||
@ -1812,7 +1812,7 @@ function updateNodeAttrs(group) {
|
||||
|
||||
// Clear cookie containing list of nodes where
|
||||
// their attributes need to be updated
|
||||
$.cookie('Nodes2Update', '');
|
||||
$.cookie('nodes2update', '');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1822,7 +1822,7 @@ function updateNodeAttrs(group) {
|
||||
*/
|
||||
function restoreNodeAttrs() {
|
||||
// Get list of nodes to update
|
||||
var nodesList = $.cookie('Nodes2Update');
|
||||
var nodesList = $.cookie('nodes2update');
|
||||
var nodes = nodesList.split(';');
|
||||
|
||||
// Get the nodes datatable
|
||||
@ -1861,7 +1861,7 @@ function restoreNodeAttrs() {
|
||||
|
||||
// Clear cookie containing list of nodes where
|
||||
// their attributes need to be updated
|
||||
$.cookie('Nodes2Update', '');
|
||||
$.cookie('nodes2update', '');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -84,7 +84,7 @@ function loadNodesetPage(tgtNodes) {
|
||||
var osLabel = $('<label for="os">Operating system:</label>');
|
||||
var osInput = $('<input type="text" name="os" title="You must give the operating system of this node or node range, e.g. rhel5.5"/>');
|
||||
osInput.one('focus', function(){
|
||||
var tmp = $.cookie('OSVers');
|
||||
var tmp = $.cookie('osvers');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
@ -99,7 +99,7 @@ function loadNodesetPage(tgtNodes) {
|
||||
var archLabel = $('<label for="arch">Architecture:</label>');
|
||||
var archInput = $('<input type="text" name="arch" title="You must give the architecture of this node or node range, e.g. s390x"/>');
|
||||
archInput.one('focus', function(){
|
||||
var tmp = $.cookie('OSArchs');
|
||||
var tmp = $.cookie('osarchs');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
@ -114,7 +114,7 @@ function loadNodesetPage(tgtNodes) {
|
||||
var profileLabel = $('<label for="profile">Profile:</label>');
|
||||
var profileInput = $('<input type="text" name="profile" title="You must give the profile for this node or node range. The typical default profile is: compute."/>');
|
||||
profileInput.one('focus', function(){
|
||||
tmp = $.cookie('Profiles');
|
||||
tmp = $.cookie('profiles');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
|
@ -179,7 +179,7 @@ function loadUpdatenodePage(tgtNodes) {
|
||||
var osLabel = $('<label for="os">Operating system:</label>');
|
||||
var osInput = $('<input type="text" name="os" title="You must give the operating system to upgrade to, e.g. rhel5.5"/>');
|
||||
osInput.one('focus', function(){
|
||||
var tmp = $.cookie('OSVers');
|
||||
var tmp = $.cookie('osvers');
|
||||
if (tmp) {
|
||||
// Turn on auto complete
|
||||
$(this).autocomplete(tmp.split(','));
|
||||
|
Loading…
Reference in New Issue
Block a user