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

Merge pull request #5398 from Ylianst/hide-powerstate

Browse Source 
hidePowerTimeline
This commit is contained in:
Ylian Saint-Hilaire 2023-10-06 12:16:06 -07:00 committed by GitHub
commit a0b7280893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/docs/meshcentral/config.md
View File

@ -1642,6 +1642,11 @@ See description for information about each item.
"type": "object", "type": "object",
"description": "LDAP options passed to ldapauth-fork" "description": "LDAP options passed to ldapauth-fork"
}, },
"hidePowerTimeline": {
"type": "boolean",
"default": false,
"description": "When enabled, this will hide the power timeline in the web ui"
},
"agentInviteCodes": { "agentInviteCodes": {
"type": "boolean", "type": "boolean",
"default": false, "default": false,

5
meshcentral-config-schema.json
View File

@ -1640,6 +1640,11 @@
"type": "object", "type": "object",
"description": "LDAP options passed to ldapauth-fork" "description": "LDAP options passed to ldapauth-fork"
}, },
"hidePowerTimeline": {
"type": "boolean",
"default": false,
"description": "When enabled, this will hide the power timeline in the web ui"
},
"agentInviteCodes": { "agentInviteCodes": {
"type": "boolean", "type": "boolean",
"default": false, "default": false,

1
sample-config-advanced.json
View File

@ -189,6 +189,7 @@
"_agentKey": [ "abc", "123" ], "_agentKey": [ "abc", "123" ],
"_ipkvm": false, "_ipkvm": false,
"minify": true, "minify": true,
"_hidePowerTimeline": true,
"_newAccounts": true, "_newAccounts": true,
"_newAccountsUserGroups": [ "ugrp//xxxxxxxxxxxxxxxxx" ], "_newAccountsUserGroups": [ "ugrp//xxxxxxxxxxxxxxxxx" ],
"_userNameIsEmail": true, "_userNameIsEmail": true,

3
views/default-mobile.handlebars
View File

@ -1250,6 +1250,7 @@
var logoutControls = JSON.parse(decodeURIComponent('{{{logoutControls}}}')); var logoutControls = JSON.parse(decodeURIComponent('{{{logoutControls}}}'));
var authCookieRenewTimer = null; var authCookieRenewTimer = null;
var webRelayPort = parseInt('{{{webRelayPort}}}'); var webRelayPort = parseInt('{{{webRelayPort}}}');
var hidePowerTimeline = {{{hidePowerTimeline}}};
var webRelayDns = '{{{webRelayDns}}}'; var webRelayDns = '{{{webRelayDns}}}';
var meshserver = null; var meshserver = null;
var xdr = null; var xdr = null;
@ -3917,7 +3918,7 @@
// Draw device power bars. The bars are 766px wide. // Draw device power bars. The bars are 766px wide.
function drawDeviceTimeline() { function drawDeviceTimeline() {
if (currentNode.mtype == 3) { QH('p10html2', '<br />'); return; } if (currentNode.mtype == 3 || hidePowerTimeline) { QH('p10html2', '<br />'); return; }
var timeline = null, now = Date.now(); var timeline = null, now = Date.now();
if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; } if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; }

3
views/default.handlebars
View File

@ -1474,6 +1474,7 @@
var sessionTime = parseInt('{{{sessiontime}}}'); var sessionTime = parseInt('{{{sessiontime}}}');
var webRelayPort = parseInt('{{{webRelayPort}}}'); var webRelayPort = parseInt('{{{webRelayPort}}}');
var webRelayDns = '{{{webRelayDns}}}'; var webRelayDns = '{{{webRelayDns}}}';
var hidePowerTimeline = {{{hidePowerTimeline}}};
var sessionRefreshTimer = null; var sessionRefreshTimer = null;
var domain = '{{{domain}}}'; var domain = '{{{domain}}}';
var domainUrl = '{{{domainurl}}}'; var domainUrl = '{{{domainurl}}}';
@ -8270,7 +8271,7 @@
// Draw device power bars. The bars are 766px wide. // Draw device power bars. The bars are 766px wide.
function drawDeviceTimeline() { function drawDeviceTimeline() {
if ((currentNode == null) || (xxcurrentView < 10) || (xxcurrentView > 19) || (currentNode.mtype == 3)) return; if ((currentNode == null) || (xxcurrentView < 10) || (xxcurrentView > 19) || (currentNode.mtype == 3) || (hidePowerTimeline)) return;
var timeline = null, now = Date.now(); var timeline = null, now = Date.now();
if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; } if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; }

3
webserver.js
View File

@ -3104,7 +3104,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
amtscanoptions: amtscanoptions, amtscanoptions: amtscanoptions,
pluginHandler: (parent.pluginHandler == null) ? 'null' : parent.pluginHandler.prepExports(), pluginHandler: (parent.pluginHandler == null) ? 'null' : parent.pluginHandler.prepExports(),
webRelayPort: ((args.relaydns != null) ? ((typeof args.aliasport == 'number') ? args.aliasport : args.port) : ((parent.webrelayserver != null) ? ((typeof args.relayaliasport == 'number') ? args.relayaliasport : parent.webrelayserver.port) : 0)), webRelayPort: ((args.relaydns != null) ? ((typeof args.aliasport == 'number') ? args.aliasport : args.port) : ((parent.webrelayserver != null) ? ((typeof args.relayaliasport == 'number') ? args.relayaliasport : parent.webrelayserver.port) : 0)),
webRelayDns: ((args.relaydns != null) ? args.relaydns[0] : '') webRelayDns: ((args.relaydns != null) ? args.relaydns[0] : ''),
hidePowerTimeline: (domain.hidepowertimeline ? 'true' : 'false')
}, dbGetFunc.req, domain), user); }, dbGetFunc.req, domain), user);
} }
xdbGetFunc.req = req; xdbGetFunc.req = req;