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

Set provmethod during provisioning. Changed nodes info bar.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10357 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2011-08-24 16:08:49 +00:00
parent dba9912d8f
commit 6ee0895e7f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,7 +563,7 @@ function createBladeProvisionExisting(inst) {
data : {
cmd : 'nodeadd',
tgt : '',
args : tgts + ';noderes.netboot=xnba;nodetype.os=' + os.val() + ';nodetype.arch=' + arch.val() + ';nodetype.profile=' + profile.val(),
args : tgts + ';noderes.netboot=xnba;nodetype.os=' + os.val() + ';nodetype.arch=' + arch.val() + ';nodetype.profile=' + profile.val() + ';nodetype.provmethod=' + boot.val(),
msg : 'cmd=nodeadd;out=' + inst
},

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

@ -477,7 +477,7 @@ function createIpmpProvisionExisting(inst) {
data : {
cmd : 'nodeadd',
tgt : '',
args : tgts + ';noderes.netboot=xnba;nodetype.os=' + os.val() + ';nodetype.arch=' + arch.val() + ';nodetype.profile=' + profile.val(),
args : tgts + ';noderes.netboot=xnba;nodetype.os=' + os.val() + ';nodetype.arch=' + arch.val() + ';nodetype.profile=' + profile.val() + ';nodetype.provmethod=' + boot.val(),
msg : 'cmd=nodeadd;out=' + inst
},

7
xCAT-UI/js/nodes/nodes.js
View File

@ -628,7 +628,7 @@ function loadNodes(data) {
$('#nodesTab').children().remove();
// Create info bar for nodes tab
var info = createInfoBar('Click on a cell to edit. Click outside the table to save changes. Hit the Escape key to ignore changes.');
var info = createInfoBar('Double-click on a cell to edit. Click outside the table to save changes. Hit the Escape key to ignore changes.');
$('#nodesTab').append(info);
// Create action bar
@ -1060,7 +1060,7 @@ function getNodesShown(tableId) {
*/
function getNodeAttrs(group) {
// Get datatable headers and rows
var headers = $('#' + nodesTableId + ' thead tr th');
var headers = $('#' + nodesTableId).parents('.dataTables_scroll').find('.dataTables_scrollHead thead tr:eq(0) th');
var nodes = $('#' + nodesTableId + ' tbody tr');
// Find group column
@ -1203,7 +1203,7 @@ function addNodes2Table(data) {
// Go through each header
for (var key in headersCol) {
// Do not put comments and status in twice
if (key != 'usercomment' && key != 'status' && key.indexOf('statustime') < 0) {
if (key != 'usercomment' && key != 'status' && key.indexOf('status') < 0) {
var val = attrs[node][key];
if (val) {
rows[nodeRowPos][headersCol[key]] = val;
@ -1343,6 +1343,7 @@ function addNodes2Table(data) {
* Additional ajax requests need to be made for zVM
*/
advancedLoad(group);
adjustColumnSize();
}
/**