MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-24 05:03:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't show AMT device import when in WAN mode.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-07-02 16:46:02 -07:00
parent 148fe804bb
commit 57a9581960
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package.json
View File

@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "0.8.70",
"version": "0.8.71",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
@ -36,6 +36,8 @@
"sample-config-advanced.json"
],
"dependencies": {
"archiver": "^4.0.2",
"archiver-zip-encrypted": "^1.0.10",
"body-parser": "^1.19.0",
"cbor": "~5.2.0",
"compression": "^1.7.4",
@ -43,17 +45,24 @@
"express": "^4.17.0",
"express-handlebars": "^3.1.0",
"express-ws": "^4.0.0",
"html-minifier": "^4.0.0",
"image-size": "^1.0.0",
"ipcheck": "^0.1.0",
"jsdom": "^16.6.0",
"minify-js": "0.0.4",
"loadavg-windows": "^1.1.1",
"minimist": "^1.2.0",
"mongodb": "^3.6.9",
"multiparty": "^4.2.1",
"nedb": "^1.8.0",
"node-forge": "^0.10.0",
"node-rdpjs-2": "^0.3.5",
"node-windows": "^1.0.0-beta.5",
"otplib": "^10.2.3",
"saslprep": "^1.0.3",
"ssh2": "^1.1.0",
"web-push": "^3.4.5",
"ws": "^5.2.0",
"xmldom": "^0.5.0",
"yauzl": "^2.10.0"
"yauzl": "^2.10.0",
"yubikeyotp": "^0.2.0"
},
"repository": {
"type": "git",

7
views/default.handlebars
View File

@ -11121,7 +11121,12 @@
// Display list of devices in this device group
count = 0;
nodes.sort(deviceSort);
var dllist = (currentMesh.mtype == 1)?'<a onclick=meshDownloadDeviceList()><img title="' + "Download device list" + '" src="images/link4.png" /></a> <a onclick=meshImportDeviceList()><img title="' + "Import device list" + '" src="images/link6.png" /></a>':'';
var dllist = '';
if (currentMesh.mtype == 1) {
dllist += '<a onclick=meshDownloadDeviceList()><img title="' + "Download device list" + '" src="images/link4.png" /></a>';
if ((features & 1) == 0) { dllist += ' <a onclick=meshImportDeviceList()><img title="' + "Import device list" + '" src="images/link6.png" /></a>'; } // Show import only in LAN or Hybrid mode
}
var y = '<table style="color:black;background-color:#EEE;border-color:#AAA;border-width:1px;border-style:solid;border-collapse:collapse" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col style=text-align:left;width:430px>' + "Devices" + '</th><th scope=col style=text-align:right>' + dllist + '</th></tr>';
for (var i in nodes) {
var node = nodes[i], gray = ((node.conn > 0)?'':' gray');