add tags to columns
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
Simon Smith committed
Oct 19, 2023 at 23:25 UTC
19e03eaf2932ef4042ff7abb6c01ca294e46b122
1 file changed
+13
views/default.handlebars
+13
@@ -3949,6 +3949,7 @@
3949
x += '<label><input id=d2c9 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('agver') >= 0)?' checked':'') + '>' + "Agent Version" + '</label><br />';
3950
x += '<label><input id=d2c6 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('desc') >= 0)?' checked':'') + '>' + "Device Description" + '</label><br />';
3951
x += '<label><input id=d2c5 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('os') >= 0)?' checked':'') + '>' + "Operating System" + '</label><br />';
3952
+ x += '<label><input id=d2c10 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('tags') >= 0)?' checked':'') + '>' + "Tags" + '</label><br />';
3953
x += '<label><input id=d2c1 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('links') >= 0)?' checked':'') + '>' + "MeshCentral Router Links" + '</label><br />';
3954
x += '<label><input id=d2c2 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('user') >= 0)?' checked':'') + '>' + "Logged in users" + '</label><br />';
3955
x += '<label><input id=d2c3 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('ip') >= 0)?' checked':'') + '>' + "Agent IP address" + '</label><br />';
@@ -3968,6 +3969,7 @@
3969
if (Q('d2c7').checked) { cols.push('lastseen'); }
3970
if (Q('d2c8').checked) { cols.push('agtype'); }
3971
if (Q('d2c9').checked) { cols.push('agver'); }
3972
+ if (Q('d2c10').checked) { cols.push('tags'); }
3973
deviceViewSettings.devsCols = cols;
3974
putstore('_deviceViewSettings', JSON.stringify(deviceViewSettings));
3975
mainUpdate(4);
@@ -4404,6 +4406,7 @@
4406
if (deviceViewSettings.devsCols.indexOf('agtype') >= 0) { colums += '<th style=color:gray;width:100px>' + "Agent Type"; }
4407
if (deviceViewSettings.devsCols.indexOf('agver') >= 0) { colums += '<th style=color:gray;width:100px>' + "Agent Version"; }
4408
if (deviceViewSettings.devsCols.indexOf('os') >= 0) { colums += '<th style=color:gray;width:160px>' + "OS"; }
4409
+ if (deviceViewSettings.devsCols.indexOf('tags') >= 0) { colums += '<th style=color:gray;width:120px>' + "Tags"; }
4410
if (deviceViewSettings.devsCols.indexOf('links') >= 0) { colums += '<th style=color:gray;width:120px>' + "Links"; }
4411
if (deviceViewSettings.devsCols.indexOf('user') >= 0) { colums += '<th style=color:gray;width:120px>' + "User"; }
4412
if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { colums += '<th style=color:gray;width:120px>' + "Address"; }
@@ -4697,6 +4700,16 @@
4700
r += '<td style=text-align:center;font-size:x-small title="' + EscapeHtml(node.osdesc?node.osdesc:'') + '">' + EscapeHtml(node.osdesc?node.osdesc:'');
4701
}
4702
}
4703
+ if (deviceViewSettings.devsCols.indexOf('tags') >= 0) { // Tags
4704
+ r += '<td style=text-align:center;font-size:x-small>';
4705
+ var groupingTags = '';
4706
+ if (node.tags != null) {
4707
+ for (var i in node.tags) {
4708
+ groupingTags += '<span style="background-color:lightgray;padding:3px;border-radius:5px">' + EscapeHtml(node.tags[i]) + '</span> ';
4709
+ }
4710
+ }
4711
+ r += '<span style=line-height:20px>' + groupingTags + '</span>';
4712
+ }
4713
if (deviceViewSettings.devsCols.indexOf('links') >= 0) { r += '<td style=text-align:center;font-size:x-small>' + getShortRouterLinks(node); } // Links
4714
if (deviceViewSettings.devsCols.indexOf('user') >= 0) { r += '<td style=text-align:center>' + getUserShortStr(node); } // User
4715
if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { var ip = ''; if (node.mtype == 3) { ip = node.host; } else if (node.ip) { ip = node.ip; } r += '<td style=text-align:center>' + ip; } // IP address