users can change the node name on rscan result dialog
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10617 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
9e8e8616d5
commit
ff714f6861
@ -283,7 +283,7 @@ bladePlugin.prototype.addNode = function() {
|
||||
open : function(event, ui) {
|
||||
$(".ui-dialog-titlebar-close").hide();
|
||||
},
|
||||
close : function(){$(this).remove()},
|
||||
close : function(){$(this).remove();},
|
||||
buttons : {
|
||||
'Ok' : function() {
|
||||
//remove all error bar
|
||||
@ -429,6 +429,8 @@ function showScanMmResult(rscanresult){
|
||||
|
||||
var rows = rscanresult.split("\n");
|
||||
if (rows.length < 2){
|
||||
resultDiv.append(createWarnBar(rows[0]));
|
||||
$('#bladeDiaInputDiv').append(resultDiv);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -457,7 +459,12 @@ function showScanMmResult(rscanresult){
|
||||
for(var j = 0; j < colnum; j++){
|
||||
temprow += '<td>';
|
||||
if (fields[j]){
|
||||
temprow += fields[j];
|
||||
if (j == 1){
|
||||
temprow += '<input value="' + fields[j] + '">';
|
||||
}
|
||||
else{
|
||||
temprow += fields[j];
|
||||
}
|
||||
}
|
||||
temprow += '</td>';
|
||||
}
|
||||
@ -478,6 +485,7 @@ function addMmScanNode(){
|
||||
$('#bladeDiaInputDiv :checked').each(function(){
|
||||
if ($(this).attr('name')){
|
||||
nodename += $(this).attr('name') + ',';
|
||||
nodename += $(this).parents('tr').find('input').eq(1).val() + ',';
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -311,7 +311,12 @@ function drawRscanResult(rscanresult){
|
||||
for(var j = 0; j < colnum; j++) {
|
||||
temprow += '<td>';
|
||||
if (fields[j]) {
|
||||
temprow += fields[j];
|
||||
if (j == 1){
|
||||
temprow += '<input value="' + fields[j] + '">';
|
||||
}
|
||||
else{
|
||||
temprow += fields[j];
|
||||
}
|
||||
}
|
||||
temprow += '</td>';
|
||||
}
|
||||
@ -381,6 +386,7 @@ function addPNode(){
|
||||
$('#pnodeeditarea :checked').each(function() {
|
||||
if ($(this).attr('name')) {
|
||||
nodename += $(this).attr('name') + ',';
|
||||
nodename += $(this).parents('tr').find('input').eq(1).val() + ',';
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -755,7 +755,7 @@ function openSettings() {
|
||||
"Ok": function(){
|
||||
// Save selected theme
|
||||
var theme = $(this).find('input[name="theme"]:checked').val();
|
||||
$.cookie('xcat_theme', theme);
|
||||
$.cookie('xcat_theme', theme, { expires: 30 });
|
||||
|
||||
// Show instructions to apply theme
|
||||
$(this).empty();
|
||||
|
Loading…
x
Reference in New Issue
Block a user