| "; - Show += " | Package Name | Version | "; - Show += "
|---|
| "; + Show += " | Package Name | Version | "; + Show += "
|---|---|---|
| "; - Show += " | " + RpmNames[temp] + " | " + Rpms[temp].substr(RpmNames[temp].length + 1) + " | "; - Show += "
"; - } + $("input[type=checkbox]:checked").each(function() { + temp = $(this).val(); + if ("" == temp) { + return true; + } - if (!rpmPath) { - errMsg += "Please select or input the repository!"; - } - - if (!rpms || !rpmPath) { - // Show warning message - var warn = createWarnBar(errMsg); - warn.prependTo($('#updateTab')); - return; - } + var pattern = new RegExp("^" + temp + ",|," + temp + ","); - // remember users' choice and input - $.cookie('xcatrepository', rpmPathType, { path: '/xcat', expires: 10 }); + if (pattern.test(rpms)) { + return true; + } + rpms = rpms + temp + ","; + }); - $('#update').show(); - $('#update').empty(); - $('#update').append("
Updating " + rpms + " from " + rpmPath + "
"); - $('#update').append("
");
- $('#rpm button').attr('disabled', 'true');
+ if (0 < rpms.length) {
+ rpms = rpms.slice(0, -1);
+ }
- // send the update command to server
- $.ajax( {
- url : 'lib/cmd.php',
- dataType : 'json',
- data : {
- cmd : 'webrun',
- tgt : '',
- args : 'update;' + rpms + ";" + rpmPath,
- msg : ''
- },
+ // Check RPM and repository
+ var errMsg = '';
+ if (!rpms) {
+ errMsg = "Please select the rpm!"; + } - success : ShowUpdateResult - }); + if (!rpmPath) { + errMsg += "Please select or input the repository!"; + } + + if (!rpms || !rpmPath) { + // Show warning message + var warn = createWarnBar(errMsg); + warn.prependTo($('#updateTab')); + return; + } + + // remember users' choice and input + $.cookie('xcatrepository', rpmPathType, { + path : '/xcat', + expires : 10 + }); + + $('#update').show(); + $('#update').empty(); + $('#update').append("
Updating " + rpms + " from " + rpmPath + "
"); + $('#update').append("");
+ $('#rpm button').attr('disabled', 'true');
+
+ // send the update command to server
+ $.ajax( {
+ url : 'lib/cmd.php',
+ dataType : 'json',
+ data : {
+ cmd : 'webrun',
+ tgt : '',
+ args : 'update;' + rpms + ";" + rpmPath,
+ msg : ''
+ },
+
+ success : ShowUpdateResult
+ });
}
+/**
+ * Show the results of the RPM update
+ *
+ * @param data
+ * Data returned from HTTP request
+ * @return Nothing
+ */
function ShowUpdateResult(data) {
- var temp = 0;
+ var temp = 0;
$('#loadingpic').remove();
-
- var resArray = data.rsp[0].split(/\n/);
- if (0 < resArray.length) {
- // Show last lines
- if (('' == resArray[resArray.length - 1]) && (resArray.length > 1)){
- $('#update').append(resArray[resArray.length - 2]);
- }
- else {
- $('#update').append(resArray[resArray.length - 1]);
- }
-
- // Create link to show details
- $('#update').append('Show details'); - $('#update a').bind('click', function(){ - // Toggle details and change text - $('#resDetail').toggle(); - if ($('#update a').text() == 'Show details') { - $('#update a').text('Hide details'); - } else { - $('#update a').text('Show details'); - } - }); - - var resDetail = $(''); - resDetail.hide(); - $('#update').append(resDetail); - - for (temp = 0; temp < resArray.length; temp++) { - resDetail.append(resArray[temp] + "
"); - } - } - - //update the rpm info - $.ajax({ - url: 'lib/systemcmd.php', - dataType : 'json', - data : { - cmd : 'rpm -q xCAT-client perl-xCAT xCAT-server xCAT xCAT-rmc xCAT-UI' - }, - success : showRpmInfo - }); - - $('#rpm button').attr('disabled', ''); + var resArray = data.rsp[0].split(/\n/); + if (0 < resArray.length) { + // Show last lines + if (('' == resArray[resArray.length - 1]) && (resArray.length > 1)) { + $('#update').append(resArray[resArray.length - 2]); + } else { + $('#update').append(resArray[resArray.length - 1]); + } + + // Create link to show details + $('#update').append('
Show details'); + $('#update a').bind('click', function() { + // Toggle details and change text + $('#resDetail').toggle(); + if ($('#update a').text() == 'Show details') { + $('#update a').text('Hide details'); + } else { + $('#update a').text('Show details'); + } + }); + + var resDetail = $(''); + resDetail.hide(); + $('#update').append(resDetail); + + for (temp = 0; temp < resArray.length; temp++) { + resDetail.append(resArray[temp] + "
"); + } + } + + // update the rpm info + $.ajax( { + url : 'lib/systemcmd.php', + dataType : 'json', + data : { + cmd : 'rpm -q xCAT-client perl-xCAT xCAT-server xCAT xCAT-rmc xCAT-UI' + }, + + success : showRpmInfo + }); + + $('#rpm button').attr('disabled', ''); } \ No newline at end of file diff --git a/xCAT-UI/js/custom/zvm.js b/xCAT-UI/js/custom/zvm.js index 0df69a000..b63eeb64a 100644 --- a/xCAT-UI/js/custom/zvm.js +++ b/xCAT-UI/js/custom/zvm.js @@ -43,7 +43,7 @@ zvmPlugin.prototype.loadClonePage = function(node) { // Get hardware control point var nodeRow = $('#' + node).parent().parent(); - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); var rowPos = dTable.fnGetPosition(nodeRow.get(0)); var aData = dTable.fnGetData(rowPos); var hcp = aData[hcpCol]; diff --git a/xCAT-UI/js/monitor/gangliamon.js b/xCAT-UI/js/monitor/gangliamon.js index 1cd3e8d25..ef649f6a9 100644 --- a/xCAT-UI/js/monitor/gangliamon.js +++ b/xCAT-UI/js/monitor/gangliamon.js @@ -6,7 +6,7 @@ function loadGangliaMon() { // Get Ganglia tab var gangliaTab = $('#gangliamon'); - + // Check whether Ganglia RPMs are installed on the xCAT MN $.ajax( { url : 'lib/systemcmd.php', @@ -17,7 +17,7 @@ function loadGangliaMon() { success : checkGangliaRPMs }); - + // Create groups and nodes DIV var groups = $(''); var nodes = $(''); @@ -54,7 +54,7 @@ function loadGangliaMon() { */ function checkGangliaRPMs(data) { var gangliaTab = $('#gangliamon'); - + // Get the list of Ganglia RPMs installed var status = data.rsp.split(/\n/); var gangliaRPMs = [ "rrdtool", "ganglia-gmetad", "ganglia-gmond", "ganglia-web" ]; @@ -66,11 +66,11 @@ function checkGangliaRPMs(data) { missingRPMs = true; } } - + // Append Ganglia PDF if (missingRPMs) { warningMsg += ". Refer to xCAT2-Monitoring.pdf for more information."; - + var warningBar = createWarnBar(warningMsg); warningBar.css('margin-bottom', '10px'); warningBar.prependTo(gangliaTab); @@ -96,37 +96,37 @@ function checkGangliaRPMs(data) { success : function(data) { if (data.rsp[0].indexOf("not-monitored") > -1) { // Create link to start Ganglia - var startLnk = $('Click here'); - startLnk.css( { - 'color' : 'blue', - 'text-decoration' : 'none' - }); - startLnk.click(function() { - // Turn on Ganglia for all nodes - monitorNode('', 'on'); - }); + var startLnk = $('Click here'); + startLnk.css( { + 'color' : 'blue', + 'text-decoration' : 'none' + }); + startLnk.click(function() { + // Turn on Ganglia for all nodes + monitorNode('', 'on'); + }); - // Create warning bar - var warningBar = $(''); - var msg = $(''); - msg.append(''); - msg.append('Please start Ganglia Monitoring on xCAT. '); - msg.append(startLnk); - msg.append(' to start Ganglia Monitoring.'); - warningBar.append(msg); - warningBar.css('margin-bottom', '10px'); - - // If there are any warning messages, append this warning after it - var curWarnings = $('#gangliamon').find('.ui-state-error'); - var gangliaTab = $('#gangliamon'); - if (curWarnings.length) { - curWarnings.after(warningBar); - } else { - warningBar.prependTo(gangliaTab); - } - } + // Create warning bar + var warningBar = $(''); + var msg = $(''); + msg.append(''); + msg.append('Please start Ganglia Monitoring on xCAT. '); + msg.append(startLnk); + msg.append(' to start Ganglia Monitoring.'); + warningBar.append(msg); + warningBar.css('margin-bottom', '10px'); + + // If there are any warning messages, append this warning after it + var curWarnings = $('#gangliamon').find('.ui-state-error'); + var gangliaTab = $('#gangliamon'); + if (curWarnings.length) { + curWarnings.after(warningBar); + } else { + warningBar.prependTo(gangliaTab); } - }); + } + } + }); } return; } @@ -141,7 +141,7 @@ function checkGangliaRPMs(data) { function loadGroups4Ganglia(data) { // Remove loader $('#groups').find('img').remove(); - + var groups = data.rsp; setGroupsCookies(data); @@ -163,21 +163,24 @@ function loadGroups4Ganglia(data) { // Turn groups list into a tree $('#groups').append(ul); $('#groups').jstree( { - core : { "initially_open" : [ "root" ] }, + core : { + "initially_open" : [ "root" ] + }, themes : { "theme" : "default", - "dots" : false, // No dots - "icons" : false // No icons + "dots" : false, // No dots + "icons" : false // No icons } }); - + // Load nodes onclick - $('#groups').bind('select_node.jstree', function(event, data) { - var thisGroup = jQuery.trim(data.rslt.obj.text()); - if (thisGroup) { - // Clear nodes division + $('#groups') + .bind('select_node.jstree', function(event, data) { + var thisGroup = jQuery.trim(data.rslt.obj.text()); + if (thisGroup) { + // Clear nodes division $('#nodes').children().remove(); - + // Create link to Ganglia var gangliaLnk = $('click here'); gangliaLnk.css( { @@ -193,7 +196,8 @@ function loadGroups4Ganglia(data) { var info = $(''); var msg = $(''); msg.append(''); - msg.append('Review the nodes that are monitored by Ganglia. You can turn on Ganglia monitoring on a node by selecting it and clicking on Monitor. If you are satisfied with the nodes you want to monitor, '); + msg + .append('Review the nodes that are monitored by Ganglia. You can turn on Ganglia monitoring on a node by selecting it and clicking on Monitor. If you are satisfied with the nodes you want to monitor, '); msg.append(gangliaLnk); msg.append(' to open Ganglia page.'); info.append(msg); @@ -209,7 +213,7 @@ function loadGroups4Ganglia(data) { tab.init(); $('#nodes').append(tab.object()); tab.add('nodesTab', 'Nodes', loader, false); - + // Get nodes within selected group $.ajax( { url : 'lib/cmd.php', @@ -223,25 +227,25 @@ function loadGroups4Ganglia(data) { success : loadNodes4Ganglia }); - + // Get subgroups within selected group // only when this is the parent group and not a subgroup if (data.rslt.obj.attr('id').indexOf('Subgroup') < 0) { - $.ajax( { - url : 'lib/cmd.php', - dataType : 'json', - data : { - cmd : 'extnoderange', - tgt : thisGroup, - args : 'subgroups', - msg : thisGroup - }, - - success : loadSubgroups - }); + $.ajax( { + url : 'lib/cmd.php', + dataType : 'json', + data : { + cmd : 'extnoderange', + tgt : thisGroup, + args : 'subgroups', + msg : thisGroup + }, + + success : loadSubgroups + }); } } // End of if (thisGroup) - }); + } ); } /** @@ -342,9 +346,7 @@ function loadNodes4Ganglia(data) { */ var powerLnk = $('Power'); - /* - * Power on - */ + // Power on var powerOnLnk = $('Power on'); powerOnLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); @@ -353,9 +355,7 @@ function loadNodes4Ganglia(data) { } }); - /* - * Power off - */ + // Power off var powerOffLnk = $('Power off'); powerOffLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); @@ -378,10 +378,8 @@ function loadNodes4Ganglia(data) { } }); - - /* - * Turn monitoring on - */ + + // Turn monitoring on var monitorOnLnk = $('Monitor on'); monitorOnLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); @@ -390,9 +388,7 @@ function loadNodes4Ganglia(data) { } }); - /* - * Turn monitoring off - */ + // Turn monitoring off var monitorOffLnk = $('Monitor off'); monitorOffLnk.bind('click', function(event) { var tgtNodes = getNodesChecked('nodesDataTable'); @@ -400,7 +396,7 @@ function loadNodes4Ganglia(data) { monitorNode(tgtNodes, 'off'); } }); - + // Power actions var monitorActions = [ monitorOnLnk, monitorOffLnk ]; var monitorActionMenu = createMenu(monitorActions); @@ -480,7 +476,7 @@ function loadNodes4Ganglia(data) { success : loadPingStatus }); - + // Get the status of Ganglia $.ajax( { url : 'lib/cmd.php', @@ -505,7 +501,7 @@ function loadNodes4Ganglia(data) { */ function loadGangliaStatus(data) { // Get datatable - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); var ganglia = data.rsp; var rowNum, node, status, args; @@ -520,7 +516,7 @@ function loadGangliaStatus(data) { // Update the power status column dTable.fnUpdate(status, rowNum, 4); } - + // Hide Ganglia loader var gangliaCol = $('#nodesDataTable thead tr th').eq(4); gangliaCol.find('img').hide(); @@ -537,7 +533,7 @@ function refreshGangliaStatus(group) { // Show ganglia loader var gangliaCol = $('#nodesDataTable thead tr th').eq(4); gangliaCol.find('img').show(); - + // Get the status of Ganglia $.ajax( { url : 'lib/cmd.php', @@ -564,7 +560,7 @@ function refreshGangliaStatus(group) { */ function monitorNode(node, monitor) { var args; - + if (monitor == 'on') { // Append loader to warning bar var gangliaLoader = createLoader(''); @@ -572,13 +568,13 @@ function monitorNode(node, monitor) { if (warningBar.length) { warningBar.append(gangliaLoader); } - + if (node) { args = 'gangliastart;' + node; } else { args = 'gangliastart'; } - + $.ajax( { url : 'lib/cmd.php', dataType : 'json', @@ -600,7 +596,7 @@ function monitorNode(node, monitor) { } else { args = 'gangliastop'; } - + $.ajax( { url : 'lib/cmd.php', dataType : 'json', diff --git a/xCAT-UI/js/nodes/mtm.js b/xCAT-UI/js/nodes/mtm.js index 487c08c07..be55a9b19 100644 --- a/xCAT-UI/js/nodes/mtm.js +++ b/xCAT-UI/js/nodes/mtm.js @@ -1,36 +1,36 @@ var hardwareInfo = { - '7037-A50' : ['P5-185', '5' ], - '9115-505' : ['P5-505', '1' ], - '9110-510' : ['P5-510', '2' ], - '9110-51A' : ['P5-510', '2' ], - '9111-520' : ['P5-520', '4' ], - '913A-52A' : ['P5-52A', '4' ], - '9113-550' : ['P5-550', '4' ], - '9133-55A' : ['P5-55A', '4' ], - '9116-561' : ['P5-560Q', '4' ], - '9117-570' : ['P5-570', '4' ], - '9118-575' : ['P5-575', '42'], - '9119-590' : ['P5-590', '42'], - '9119-595' : ['P5-595', '42'], + '7037-A50' : [ 'P5-185', '5' ], + '9115-505' : [ 'P5-505', '1' ], + '9110-510' : [ 'P5-510', '2' ], + '9110-51A' : [ 'P5-510', '2' ], + '9111-520' : [ 'P5-520', '4' ], + '913A-52A' : [ 'P5-52A', '4' ], + '9113-550' : [ 'P5-550', '4' ], + '9133-55A' : [ 'P5-55A', '4' ], + '9116-561' : [ 'P5-560Q', '4' ], + '9117-570' : [ 'P5-570', '4' ], + '9118-575' : [ 'P5-575', '42' ], + '9119-590' : [ 'P5-590', '42' ], + '9119-595' : [ 'P5-595', '42' ], - //P6 - '8203-E4A' : ['P6-520', '4' ], - '9407-M15' : ['P6-520', '4' ], - '9408-M25' : ['P6-520', '4' ], - '8204-E8A' : ['P6-550', '4' ], - '9409-M50' : ['P6-550', '4' ], - '8234-EMA' : ['P6-560', '4' ], - '9117-MMA' : ['P6-570', '4' ], - '9125-F2A' : ['P6-575', '42'], - '9119-FHA' : ['P6-595', '42'], + // P6 + '8203-E4A' : [ 'P6-520', '4' ], + '9407-M15' : [ 'P6-520', '4' ], + '9408-M25' : [ 'P6-520', '4' ], + '8204-E8A' : [ 'P6-550', '4' ], + '9409-M50' : [ 'P6-550', '4' ], + '8234-EMA' : [ 'P6-560', '4' ], + '9117-MMA' : [ 'P6-570', '4' ], + '9125-F2A' : [ 'P6-575', '42' ], + '9119-FHA' : [ 'P6-595', '42' ], - //P7 - '8202-E4B' : ['P7-720', '4' ], - '8205-E6B' : ['P7-740', '4' ], - '8231-E2B' : ['P7-710/730', '2' ], - '8233-E8B' : ['P7-750', '4' ], - '8236-E8C' : ['P7-755', '4' ], - '9117-MMB' : ['P7-770', '4' ], - '9119-FHB' : ['P7-795', '42'], - '9179-MHB' : ['P7-780', '42'] + // P7 + '8202-E4B' : [ 'P7-720', '4' ], + '8205-E6B' : [ 'P7-740', '4' ], + '8231-E2B' : [ 'P7-710/730', '2' ], + '8233-E8B' : [ 'P7-750', '4' ], + '8236-E8C' : [ 'P7-755', '4' ], + '9117-MMB' : [ 'P7-770', '4' ], + '9119-FHB' : [ 'P7-795', '42' ], + '9179-MHB' : [ 'P7-780', '42' ] }; \ No newline at end of file diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js index 357d25a11..729eb679a 100644 --- a/xCAT-UI/js/nodes/nodes.js +++ b/xCAT-UI/js/nodes/nodes.js @@ -2,7 +2,6 @@ * Global variables */ var nodesTabs; // Node tabs -var nodesDataTable; // Datatable containing all nodes within a group var origAttrs = new Object(); // Original node attributes /** @@ -26,27 +25,6 @@ function getNodesTab() { return nodesTabs; } -/** - * Get the nodes datatable - * - * @param Nothing - * @return Data table object - */ -function getNodesDataTable() { - return nodesDataTable; -} - -/** - * Set the nodes datatable - * - * @param table - * Data table object - * @return Nothing - */ -function setNodesDataTable(table) { - nodesDataTable = table; -} - /** * Load nodes page * @@ -189,6 +167,7 @@ function loadGroups(data) { }); } + // Get physical layout $.ajax({ url : 'lib/cmd.php', dataType : 'json', @@ -267,7 +246,7 @@ function loadGroups(data) { addNodeLink.tooltip({ position: "center right", // Place tooltip on the right edge offset: [-2, 10], // A little tweaking of the position - effect: "fade", // Use the built-in fadeIn/fadeOut effect + effect: "fade", // Use the built-in fadeIn/fadeOut effect opacity: 0.7 // Custom opacity setting }); @@ -317,7 +296,7 @@ function loadNodes(data) { // Node attributes var headers = new Object(); - // Clear cookie containing list of nodes where + // Clear cookie containing list of nodes where // their attributes need to be updated $.cookie('Nodes2Update', ''); // Clear hash table containing node attributes @@ -414,7 +393,8 @@ function loadNodes(data) { position: "center right", // Place tooltip on the right edge offset: [-2, 10], // A little tweaking of the position relative: true, - effect: "fade", // Use the built-in fadeIn/fadeOut effect + effect: "fade", // Use the built-in fadeIn/fadeOut + // effect opacity: 0.8 // Custom opacity setting }); @@ -626,7 +606,6 @@ function loadNodes(data) { var myDataTable = $('#nodesDataTable').dataTable({ 'iDisplayLength': 50 }); - setNodesDataTable(myDataTable); // Do not sort ping, power, and comment column var pingCol = $('#nodesDataTable thead tr th').eq(2); @@ -662,7 +641,7 @@ function loadNodes(data) { var colPos = this.cellIndex; // Get row index - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); var rowPos = dTable.fnGetPosition(this.parentNode); // Update datatable @@ -679,7 +658,8 @@ function loadNodes(data) { return (value); }, { - onblur : 'submit', // Clicking outside editable area submits changes + onblur : 'submit', // Clicking outside editable area submits + // changes type : 'textarea', placeholder: ' ', height : '30px' // The height of the text area @@ -765,7 +745,7 @@ function loadNodes(data) { */ function loadPowerStatus(data) { // Get datatable - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); var power = data.rsp; var rowNum, node, status, args; @@ -823,7 +803,7 @@ function refreshPowerStatus(group) { */ function loadPingStatus(data) { // Get data table - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); var ping = data.rsp; var rowPos, node, status; @@ -990,7 +970,7 @@ function loadUnlockPage(tgtNodes) { unlockForm.find('div input[title]').tooltip({ position: "center right", // Place tooltip on the right edge offset: [-2, 10], // A little tweaking of the position - effect: "fade", // Use the built-in fadeIn/fadeOut effect + effect: "fade", // Use the built-in fadeIn/fadeOut effect opacity: 0.7 // Custom opacity setting }); @@ -1094,7 +1074,7 @@ function loadScriptPage(tgtNodes) { scriptForm.find('div input[title]').tooltip({ position: "center right", // Place tooltip on the right edge offset: [-2, 10], // A little tweaking of the position - effect: "fade", // Use the built-in fadeIn/fadeOut effect + effect: "fade", // Use the built-in fadeIn/fadeOut effect opacity: 0.7 // Custom opacity setting }); @@ -1311,7 +1291,7 @@ function updateStatusBar(data) { $('#' + statBarId).append(prg); } else if (cmd == 'rmvm') { // Get data table - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); var failed = false; // Hide loader @@ -1404,7 +1384,7 @@ function formComplete(tabId) { */ function updatePowerStatus(data) { // Get datatable - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); // Get all nodes within the datatable var rows = dTable.fnGetNodes(); @@ -1489,7 +1469,7 @@ function runScript(inst) { * @param node * The node * @param attrName - * The attribute + * The attribute * @return The attribute of the node */ function getNodeAttr(node, attrName) { @@ -1508,7 +1488,7 @@ function getNodeAttr(node, attrName) { } } - // If the column containing the attribute is found + // If the column containing the attribute is found if (attrCol) { // Get the attribute column index var attrIndex = attrCol.index(); @@ -1624,7 +1604,7 @@ function getNodeRow(tgtNode, rows) { * Get nodes that are checked in a given datatable * * @param datatableId - * The datatable ID + * The datatable ID * @return Nodes that were checked */ function getNodesChecked(datatableId) { @@ -1652,7 +1632,7 @@ function getNodesChecked(datatableId) { * Get the column index for a given column name * * @param colName - * The column name to search + * The column name to search * @return The index containing the column name */ function getColNum(colName){ @@ -1671,12 +1651,12 @@ function getColNum(colName){ * Get the row index for a given node name * * @param nodeName - * Node name + * Node name * @return The row index containing the node name */ function getRowNum(nodeName){ // Get datatable - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); // Get all data from datatable var data = dTable.fnGetData(); @@ -1798,7 +1778,8 @@ function updateNodeAttrs(group) { begin = out[i].indexOf('(') + 1; end = out[i].indexOf(')'); - // Split the attribute, e.g. Table:nodetype - Key:node - Column:arch + // Split the attribute, e.g. Table:nodetype - Key:node - + // Column:arch tmp = out[i].substring(begin, end).split('-'); key = jQuery.trim(tmp[2].replace('Column:', '')); value = jQuery.trim(tmp[0].replace('Table:', '')); @@ -1807,7 +1788,7 @@ function updateNodeAttrs(group) { } // Get the nodes datatable - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); // Get all nodes within the datatable var rows = dTable.fnGetNodes(); @@ -1872,7 +1853,7 @@ function updateNodeAttrs(group) { } // End of if } // End of for - // Clear cookie containing list of nodes where + // Clear cookie containing list of nodes where // their attributes need to be updated $.cookie('Nodes2Update', ''); } // End of function @@ -1890,7 +1871,7 @@ function restoreNodeAttrs() { var nodes = nodesList.split(';'); // Get the nodes datatable - var dTable = getNodesDataTable(); + var dTable = $('#nodesDataTable').dataTable(); // Get table headers var headers = $('#nodesDataTable thead tr th'); // Get all nodes within the datatable @@ -1923,7 +1904,7 @@ function restoreNodeAttrs() { } // End of if } // End of for - // Clear cookie containing list of nodes where + // Clear cookie containing list of nodes where // their attributes need to be updated $.cookie('Nodes2Update', ''); } diff --git a/xCAT-UI/js/nodes/physical.js b/xCAT-UI/js/nodes/physical.js index 2628d052a..02715aa5a 100644 --- a/xCAT-UI/js/nodes/physical.js +++ b/xCAT-UI/js/nodes/physical.js @@ -1,10 +1,9 @@ - - var bpaList; var fspList; var lparList; var nodeList; var selectNode = new Object(); + /** * extract all nodes userful data into a hash, which is used for creating graphical * diff --git a/xCAT-UI/js/provision/provision.js b/xCAT-UI/js/provision/provision.js index a67387b1e..72207115b 100644 --- a/xCAT-UI/js/provision/provision.js +++ b/xCAT-UI/js/provision/provision.js @@ -37,7 +37,7 @@ function loadProvisionPage() { } // Create info bar - var infoBar = createInfoBar('Provision a node'); + var infoBar = createInfoBar('Provision or re-provision a node on a selected platform'); $('#content').append(infoBar); // Create provision form @@ -51,7 +51,7 @@ function loadProvisionPage() { $('#content').append(tab.object()); // Create radio buttons for platforms - var hwList =$('
- Select a platform to provision on:
- Select a platform to provision on: