Fixed web page title with device group

Ylian Saint-Hilaire committed Sep 14, 2019 at 17:44 UTC bcbab066c6d2c97366fec10ecf02879e867dc368
2 files changed +11 -3
package.json
+1 -1
@@ -1,6 +1,6 @@
1 {
2 "name": "meshcentral",
3 - "version": "0.4.0-q",
3 + "version": "0.4.0-r",
4 "keywords": [
5 "Remote Management",
6 "Intel AMT",
views/default.handlebars
+10 -2
@@ -4230,7 +4230,11 @@
4230 refreshDeviceEvents();
4231
4232 // Update the web page title
4233 - if ((currentNode) && (xxcurrentView >= 10) && (xxcurrentView < 20)) { document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name + ' - ' + mesh.name; } else { document.title = decodeURIComponent("{{{extitle}}}"); }
4233 + if ((currentNode) && (xxcurrentView >= 10) && (xxcurrentView < 20)) {
4234 + document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name + ' - ' + mesh.name;
4235 + } else {
4236 + document.title = decodeURIComponent("{{{extitle}}}");
4237 + }
4238
4239 // Clear user consent status if present
4240 p11clearConsoleMsg();
@@ -8826,7 +8830,11 @@
8830 if ((x == 40) && (serverTimelineStats == null)) { refreshServerTimelineStats(); }
8831
8832 // Update the web page title
8829 - if ((currentNode) && (x >= 10) && (x < 20)) { document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name; } else { document.title = decodeURIComponent("{{{extitle}}}"); }
8833 + if ((currentNode) && (x >= 10) && (x < 20)) {
8834 + document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name + ' - ' + meshes[currentNode.meshid].name;
8835 + } else {
8836 + document.title = decodeURIComponent("{{{extitle}}}");
8837 + }
8838 }
8839
8840 // Generic methods