MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bootstrap: fix edit node and duplicate lastbootuptime 

Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2024-11-10 20:23:54 +00:00
parent badee98b71
commit 9a8f4e8ebe
2 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/styles/style-bootstrap.css
View File

@ -1305,10 +1305,6 @@ NoMeshesPanel img {
font-size: small; font-size: small;
} }
#dp10devicevalue {
width: 230px;
}
.fulldesk #p11 { .fulldesk #p11 {
height: 100%; height: 100%;
} }

93
views/default3.handlebars
View File

@ -10036,12 +10036,11 @@
var showEditNodeValueDialog_modes4 = [64, 64, 64, 4096]; var showEditNodeValueDialog_modes4 = [64, 64, 64, 4096];
function showEditNodeValueDialog(mode) { function showEditNodeValueDialog(mode) {
if (xxdialogMode) return; if (xxdialogMode) return;
var x = '<select id=dp10devicevalue multiple class="form-control" maxlength=' + showEditNodeValueDialog_modes4[mode] + ' class=form-control>'; var x = '';
var y = ''; var y = '';
var v = currentNode[showEditNodeValueDialog_modes2[mode]];
if (v == null) v = '';
if (mode == 3) { if (mode == 3) {
// Get a list of all possible device tags // Get a list of all possible device tags
x = '<select id=dp10devicevalue multiple class="form-control" maxlength=' + showEditNodeValueDialog_modes4[mode] + ' class=form-control>';
var allTags = []; var allTags = [];
for (var i in nodes) { if (nodes[i].tags) { for (var j in nodes[i].tags) { if (allTags.indexOf(nodes[i].tags[j]) == -1) { allTags.push(nodes[i].tags[j]); } } } } for (var i in nodes) { if (nodes[i].tags) { for (var j in nodes[i].tags) { if (allTags.indexOf(nodes[i].tags[j]) == -1) { allTags.push(nodes[i].tags[j]); } } } }
if (allTags.length > 0) { if (allTags.length > 0) {
@ -10051,18 +10050,29 @@
y += Array.isArray(v) && v.indexOf(allTags[i]) !== -1 ? '<option selected=selected>' + EscapeHtml(allTags[i]) + '</option>' : '<option>' + EscapeHtml(allTags[i]) + '</option>'; y += Array.isArray(v) && v.indexOf(allTags[i]) !== -1 ? '<option selected=selected>' + EscapeHtml(allTags[i]) + '</option>' : '<option>' + EscapeHtml(allTags[i]) + '</option>';
} }
} }
x += y + '</select>'
setModalContent('xxAddAgent', "Edit Tags", x);
$('#dp10devicevalue').select2({
theme: "bootstrap-5",
width: $( this ).data( 'width' ) ? $( this ).data( 'width' ) : $( this ).hasClass( 'w-100' ) ? '100%' : 'style',
placeholder: showEditNodeValueDialog_modes3[mode],
closeOnSelect: false,
allowClear: true,
tokenSeparators: [','],
tags: true
});
} else {
x = addHtmlFormFloating(showEditNodeValueDialog_modes[mode], '<input id=dp10devicevalue class="form-control" maxlength=' + showEditNodeValueDialog_modes4[mode] + ' placeholder="' + showEditNodeValueDialog_modes3[mode] + '" onchange=p10editdevicevalueValidate(' + mode + ',event) onkeyup=p10editdevicevalueValidate(' + mode + ',event) class=form-control/>');
setModalContent('xxAddAgent', 'Edit Device', x);
showModal('xxAddAgentModal', 'idx_dlgOkButton', function () {
showEditNodeValueDialogEx(3, mode);
});
} }
x += y + '</select>' var v = currentNode[showEditNodeValueDialog_modes2[mode]];
setModalContent('xxAddAgent', "Edit Tags", x); if (v == null) v = '';
$('#dp10devicevalue').select2({ if (Array.isArray(v)) { v = v.join(', '); }
theme: "bootstrap-5", Q('dp10devicevalue').value = v;
width: $( this ).data( 'width' ) ? $( this ).data( 'width' ) : $( this ).hasClass( 'w-100' ) ? '100%' : 'style', p10editdevicevalueValidate();
placeholder: showEditNodeValueDialog_modes3[mode],
closeOnSelect: false,
allowClear: true,
tokenSeparators: [','],
tags: true
});
showModal('xxAddAgentModal', 'idx_dlgOkButton', function () { showEditNodeValueDialogEx(3, mode); }); showModal('xxAddAgentModal', 'idx_dlgOkButton', function () { showEditNodeValueDialogEx(3, mode); });
Q('dp10devicevalue').focus(); Q('dp10devicevalue').focus();
} }
@ -10077,10 +10087,15 @@
} }
function showEditNodeValueDialogEx(button, mode) { function showEditNodeValueDialogEx(button, mode) {
var tt = $('#dp10devicevalue').select2('data'), tags = ""; var tags = '';
for (var i in tt) { tags += tt[i]['text'].trim() + ', '; }
var x = { action: 'changedevice', nodeid: currentNode._id }; var x = { action: 'changedevice', nodeid: currentNode._id };
x[showEditNodeValueDialog_modes2[mode]] = decodeURIComponent(tags.slice(0,-2)); if (mode == 3) {
var tt = $('#dp10devicevalue').select2('data');
for (var i in tt) { tags += tt[i]['text'].trim() + ', '; }
x[showEditNodeValueDialog_modes2[mode]] = decodeURIComponent(tags.slice(0,-2));
} else {
x[showEditNodeValueDialog_modes2[mode]] = Q('dp10devicevalue').value;
}
meshserver.send(x); meshserver.send(x);
} }
@ -13152,35 +13167,23 @@
var x = ''; var x = '';
if (node.rname) { x += addDetailItem("Name", EscapeHtml(node.rname), s); } if (node.rname) { x += addDetailItem("Name", EscapeHtml(node.rname), s); }
if (node.osdesc) { x += addDetailItem("Version", EscapeHtml(node.osdesc), s); } if (node.osdesc) { x += addDetailItem("Version", EscapeHtml(node.osdesc), s); }
if ((hardware.windows && hardware.windows.osinfo) || node.osdesc) { if (hardware.windows && hardware.windows.osinfo) {
if (hardware.windows && hardware.windows.osinfo) { var m = hardware.windows.osinfo;
var m = hardware.windows.osinfo; if (m.OSArchitecture) {
if (m.OSArchitecture) { if (m.OSArchitecture.startsWith('32')) { x += addDetailItem("Architecture", "32-bit", s); }
if (m.OSArchitecture.startsWith('32')) { x += addDetailItem("Architecture", "32-bit", s); } else if (m.OSArchitecture.startsWith('64')) { x += addDetailItem("Architecture", "64-bit", s); }
else if (m.OSArchitecture.startsWith('64')) { x += addDetailItem("Architecture", "64-bit", s); } else { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); }
else { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); }
}
if (m.LastBootUpTime) {
var thedate = {
year: parseInt(m.LastBootUpTime.substring(0, 4)),
month: parseInt(m.LastBootUpTime.substring(4, 6)) - 1, // Months are 0-based in JavaScript (0 - January, 11 - December)
day: parseInt(m.LastBootUpTime.substring(6, 8)),
hours: parseInt(m.LastBootUpTime.substring(8, 10)),
minutes: parseInt(m.LastBootUpTime.substring(10, 12)),
seconds: parseInt(m.LastBootUpTime.substring(12, 14)),
};
const date = printDateTime(new Date(thedate.year, thedate.month, thedate.day, thedate.hours, thedate.minutes, thedate.seconds));
x += addDetailItem("Last Boot Up Time", date);
}
} }
if (hardware.linux && hardware.linux.LastBootUpTime) { if (m.LastBootUpTime) {
var lastBootUpTime = new Date(hardware.linux.LastBootUpTime); var thedate = {
const date = printDateTime(lastBootUpTime); year: parseInt(m.LastBootUpTime.substring(0, 4)),
x += addDetailItem("Last Boot Up Time", date); month: parseInt(m.LastBootUpTime.substring(4, 6)) - 1, // Months are 0-based in JavaScript (0 - January, 11 - December)
} day: parseInt(m.LastBootUpTime.substring(6, 8)),
if (hardware.darwin && hardware.darwin.LastBootUpTime) { hours: parseInt(m.LastBootUpTime.substring(8, 10)),
var lastBootUpTime = new Date(hardware.darwin.LastBootUpTime * 1000); // must times by 1000 even tho timestamp is correct? minutes: parseInt(m.LastBootUpTime.substring(10, 12)),
const date = printDateTime(lastBootUpTime); seconds: parseInt(m.LastBootUpTime.substring(12, 14)),
};
const date = printDateTime(new Date(thedate.year, thedate.month, thedate.day, thedate.hours, thedate.minutes, thedate.seconds));
x += addDetailItem("Last Boot Up Time", date); x += addDetailItem("Last Boot Up Time", date);
} }
} }