Fixed MacOS agent download link on invitation page.

This commit is contained in:
Ylian Saint-Hilaire 2019-08-08 11:15:44 -07:00
parent 9b2f2fc2ee
commit 083485ac33
7 changed files with 12 additions and 11 deletions

View File

@ -709,16 +709,14 @@ function createMeshCore(agent)
} catch (e) { } } catch (e) { }
break; break;
} }
/*
case 'serviceRestart': { case 'serviceRestart': {
// Start a service // Restart a service
try { try {
var service = require('service-manager').manager.getService(data.serviceName); var service = require('service-manager').manager.getService(data.serviceName);
if (service != null) { service.stop(); service.start(); } if (service != null) { service.restart(); }
} catch (e) { } } catch (e) { }
break; break;
} }
*/
case 'openUrl': { case 'openUrl': {
// Open a local web browser and return success/fail // Open a local web browser and return success/fail
MeshServerLog('Opening: ' + data.url, data); MeshServerLog('Opening: ' + data.url, data);

View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.3.9-k", "version": "0.3.9-l",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

View File

@ -2529,6 +2529,10 @@ a {
border-radius: 5px; border-radius: 5px;
} }
.night .tagSpan {
color: black;
}
.suggestionBox { .suggestionBox {
position:absolute; position:absolute;
background-color: #6CC; background-color: #6CC;

View File

@ -250,7 +250,7 @@
Q('win32url').href = url; Q('win32url').href = url;
// MacOS Setup // MacOS Setup
url = 'meshagents?id=16&meshid=' + meshid; url = 'meshosxagent?id=16&meshid=' + meshid;
Q('macosurl').href = url; Q('macosurl').href = url;
// Linux Setup // Linux Setup

File diff suppressed because one or more lines are too long

View File

@ -5245,8 +5245,7 @@
if (service.status.isSharedProcess === true) { serviceTypes.push('SharedProcess'); } if (service.status.isSharedProcess === true) { serviceTypes.push('SharedProcess'); }
if (serviceTypes.length > 0) { x += addHtmlValue('Type', serviceTypes.join(', ')); } if (serviceTypes.length > 0) { x += addHtmlValue('Type', serviceTypes.join(', ')); }
} }
x += '<br/><div style=float:right;margin-bottom:12px><input type=button value="Close" onclick=showServiceDetailsDialogEx(0,' + index + ')></div><div style=margin-bottom:12px><input type=button value="Start" onclick=showServiceDetailsDialogEx(1,' + index + ')><input type=button value="Stop" onclick=showServiceDetailsDialogEx(2,' + index + ')></div>'; x += '<br/><div style=float:right;margin-bottom:12px><input type=button value="Close" onclick=showServiceDetailsDialogEx(0,' + index + ')></div><div style=margin-bottom:12px><input type=button value="Start" onclick=showServiceDetailsDialogEx(1,' + index + ')><input type=button value="Stop" onclick=showServiceDetailsDialogEx(2,' + index + ')><input type=button value="Restart" onclick=showServiceDetailsDialogEx(3,' + index + ')></div>';
// <input type=button value="Restart" onclick=showServiceDetailsDialogEx(3,' + index + ')>
setDialogMode(2, "Service Details", 8, null, x, name); setDialogMode(2, "Service Details", 8, null, x, name);
} }
} }
@ -5258,7 +5257,7 @@
if (service != null) { if (service != null) {
if (action == 1) { meshserver.send({ action: 'msg', type: 'serviceStart', nodeid: currentNode._id, serviceName: service.name }); } if (action == 1) { meshserver.send({ action: 'msg', type: 'serviceStart', nodeid: currentNode._id, serviceName: service.name }); }
if (action == 2) { meshserver.send({ action: 'msg', type: 'serviceStop', nodeid: currentNode._id, serviceName: service.name }); } if (action == 2) { meshserver.send({ action: 'msg', type: 'serviceStop', nodeid: currentNode._id, serviceName: service.name }); }
//if (action == 3) { meshserver.send({ action: 'msg', type: 'serviceRestart', nodeid: currentNode._id, serviceName: service.name }); } if (action == 3) { meshserver.send({ action: 'msg', type: 'serviceRestart', nodeid: currentNode._id, serviceName: service.name }); }
setTimeout(function () { refreshDeskTools(1) }, 1000); setTimeout(function () { refreshDeskTools(1) }, 1000);
} }
} }

File diff suppressed because one or more lines are too long