From 6ee0895e7f8c733a996583885d810df4f9db6131 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 24 Aug 2011 16:08:49 +0000
Subject: [PATCH] Set provmethod during provisioning.  Changed nodes info bar.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10357 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/js/custom/blade.js | 2 +-
 xCAT-UI/js/custom/ipmi.js  | 2 +-
 xCAT-UI/js/nodes/nodes.js  | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/xCAT-UI/js/custom/blade.js b/xCAT-UI/js/custom/blade.js
index b5798cff3..fe1363cfa 100644
--- a/xCAT-UI/js/custom/blade.js
+++ b/xCAT-UI/js/custom/blade.js
@@ -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
 				},
 
diff --git a/xCAT-UI/js/custom/ipmi.js b/xCAT-UI/js/custom/ipmi.js
index 299f331f5..b101c703e 100644
--- a/xCAT-UI/js/custom/ipmi.js
+++ b/xCAT-UI/js/custom/ipmi.js
@@ -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
 				},
 
diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js
index fc3c58d4e..e08eee986 100644
--- a/xCAT-UI/js/nodes/nodes.js
+++ b/xCAT-UI/js/nodes/nodes.js
@@ -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();
 }
 
 /**