mirror of
				https://github.com/Ylianst/MeshCentral.git
				synced 2025-03-09 15:40:18 +00:00 
			
		
		
		
	add tags to columns
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
This commit is contained in:
		
							parent
							
								
									c9b47edc75
								
							
						
					
					
						commit
						19e03eaf29
					
				
					 1 changed files with 13 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -3949,6 +3949,7 @@
 | 
			
		|||
            x += '<label><input id=d2c9 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('agver') >= 0)?' checked':'') + '>' + "Agent Version" + '</label><br />';
 | 
			
		||||
            x += '<label><input id=d2c6 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('desc') >= 0)?' checked':'') + '>' + "Device Description" + '</label><br />';
 | 
			
		||||
            x += '<label><input id=d2c5 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('os') >= 0)?' checked':'') + '>' + "Operating System" + '</label><br />';
 | 
			
		||||
            x += '<label><input id=d2c10 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('tags') >= 0)?' checked':'') + '>' + "Tags" + '</label><br />';
 | 
			
		||||
            x += '<label><input id=d2c1 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('links') >= 0)?' checked':'') + '>' + "MeshCentral Router Links" + '</label><br />';
 | 
			
		||||
            x += '<label><input id=d2c2 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('user') >= 0)?' checked':'') + '>' + "Logged in users" + '</label><br />';
 | 
			
		||||
            x += '<label><input id=d2c3 type=checkbox' + ((deviceViewSettings.devsCols.indexOf('ip') >= 0)?' checked':'') + '>' + "Agent IP address" + '</label><br />';
 | 
			
		||||
| 
						 | 
				
			
			@ -3968,6 +3969,7 @@
 | 
			
		|||
            if (Q('d2c7').checked) { cols.push('lastseen'); }
 | 
			
		||||
            if (Q('d2c8').checked) { cols.push('agtype'); }
 | 
			
		||||
            if (Q('d2c9').checked) { cols.push('agver'); }
 | 
			
		||||
            if (Q('d2c10').checked) { cols.push('tags'); }
 | 
			
		||||
            deviceViewSettings.devsCols = cols;
 | 
			
		||||
            putstore('_deviceViewSettings', JSON.stringify(deviceViewSettings));
 | 
			
		||||
            mainUpdate(4);
 | 
			
		||||
| 
						 | 
				
			
			@ -4404,6 +4406,7 @@
 | 
			
		|||
                        if (deviceViewSettings.devsCols.indexOf('agtype') >= 0) { colums += '<th style=color:gray;width:100px>' + "Agent Type"; }
 | 
			
		||||
                        if (deviceViewSettings.devsCols.indexOf('agver') >= 0) { colums += '<th style=color:gray;width:100px>' + "Agent Version"; }
 | 
			
		||||
                        if (deviceViewSettings.devsCols.indexOf('os') >= 0) { colums += '<th style=color:gray;width:160px>' + "OS"; }
 | 
			
		||||
                        if (deviceViewSettings.devsCols.indexOf('tags') >= 0) { colums += '<th style=color:gray;width:120px>' + "Tags"; }
 | 
			
		||||
                        if (deviceViewSettings.devsCols.indexOf('links') >= 0) { colums += '<th style=color:gray;width:120px>' + "Links"; }
 | 
			
		||||
                        if (deviceViewSettings.devsCols.indexOf('user') >= 0) { colums += '<th style=color:gray;width:120px>' + "User"; }
 | 
			
		||||
                        if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { colums += '<th style=color:gray;width:120px>' + "Address"; }
 | 
			
		||||
| 
						 | 
				
			
			@ -4697,6 +4700,16 @@
 | 
			
		|||
                        r += '<td style=text-align:center;font-size:x-small title="' + EscapeHtml(node.osdesc?node.osdesc:'') + '">' + EscapeHtml(node.osdesc?node.osdesc:'');
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                if (deviceViewSettings.devsCols.indexOf('tags') >= 0) { // Tags
 | 
			
		||||
                    r += '<td style=text-align:center;font-size:x-small>';
 | 
			
		||||
                    var groupingTags = '';
 | 
			
		||||
                    if (node.tags != null) { 
 | 
			
		||||
                        for (var i in node.tags) {
 | 
			
		||||
                            groupingTags += '<span style="background-color:lightgray;padding:3px;border-radius:5px">' + EscapeHtml(node.tags[i]) + '</span> ';
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
                    r += '<span style=line-height:20px>' + groupingTags + '</span>';
 | 
			
		||||
                }
 | 
			
		||||
                if (deviceViewSettings.devsCols.indexOf('links') >= 0) { r += '<td style=text-align:center;font-size:x-small>' + getShortRouterLinks(node); } // Links
 | 
			
		||||
                if (deviceViewSettings.devsCols.indexOf('user') >= 0) { r += '<td style=text-align:center>' + getUserShortStr(node); } // User
 | 
			
		||||
                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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue