Fixed multi-desktop connect all.
Ylian Saint-Hilaire committed
Dec 21, 2019 at 16:47 UTC
f79698bb53921dcbd03b20b95c0a2ef45bcdf01c
13 files changed
+73
-25
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.4.6-h",
3
+ "version": "0.4.6-i",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
views/default-min.handlebars
+6
-2
@@ -2009,7 +2009,7 @@
2009
var count = 0;
2010
for (var i in nodes) {
2011
var node = nodes[i], nodeid = nodes[i]._id;
2012
- if (multiDesktop[nodeid] == null) {
2012
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
2013
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
2014
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
2015
//var conn = 0;
@@ -2022,7 +2022,11 @@
2022
}
2023
2024
// Perform connect all
2025
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
2025
+ for (var i in nodes) {
2026
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
2027
+ toggleKvmDevice(nodes[i]._id);
2028
+ }
2029
+ }
2030
}
2031
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
2032
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Disconnected", "Connecting...", "Setup...", '', ''][state]); } catch (ex) {} }
views/default.handlebars
+6
-2
@@ -3063,7 +3063,7 @@
3063
var count = 0;
3064
for (var i in nodes) {
3065
var node = nodes[i], nodeid = nodes[i]._id;
3066
- if (multiDesktop[nodeid] == null) {
3066
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
3067
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
3068
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
3069
//var conn = 0;
@@ -3076,7 +3076,11 @@
3076
}
3077
3078
// Perform connect all
3079
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
3079
+ for (var i in nodes) {
3080
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
3081
+ toggleKvmDevice(nodes[i]._id);
3082
+ }
3083
+ }
3084
}
3085
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
3086
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Disconnected", "Connecting...", "Setup...", '', ''][state]); } catch (ex) {} }
views/translations/default-min_cs.handlebars
+6
-2
@@ -2009,7 +2009,7 @@
2009
var count = 0;
2010
for (var i in nodes) {
2011
var node = nodes[i], nodeid = nodes[i]._id;
2012
- if (multiDesktop[nodeid] == null) {
2012
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
2013
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
2014
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
2015
//var conn = 0;
@@ -2022,7 +2022,11 @@
2022
}
2023
2024
// Perform connect all
2025
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
2025
+ for (var i in nodes) {
2026
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
2027
+ toggleKvmDevice(nodes[i]._id);
2028
+ }
2029
+ }
2030
}
2031
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
2032
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Odpojeno", "Připojování...", "Nastavení...", '', ''][state]); } catch (ex) {} }
views/translations/default-min_fr.handlebars
+6
-2
@@ -2009,7 +2009,7 @@
2009
var count = 0;
2010
for (var i in nodes) {
2011
var node = nodes[i], nodeid = nodes[i]._id;
2012
- if (multiDesktop[nodeid] == null) {
2012
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
2013
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
2014
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
2015
//var conn = 0;
@@ -2022,7 +2022,11 @@
2022
}
2023
2024
// Perform connect all
2025
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
2025
+ for (var i in nodes) {
2026
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
2027
+ toggleKvmDevice(nodes[i]._id);
2028
+ }
2029
+ }
2030
}
2031
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
2032
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Débranché", "Connecting...", "Traitement...", '', ''][state]); } catch (ex) {} }
views/translations/default-min_ja.handlebars
+6
-2
@@ -2009,7 +2009,7 @@
2009
var count = 0;
2010
for (var i in nodes) {
2011
var node = nodes[i], nodeid = nodes[i]._id;
2012
- if (multiDesktop[nodeid] == null) {
2012
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
2013
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
2014
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
2015
//var conn = 0;
@@ -2022,7 +2022,11 @@
2022
}
2023
2024
// Perform connect all
2025
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
2025
+ for (var i in nodes) {
2026
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
2027
+ toggleKvmDevice(nodes[i]._id);
2028
+ }
2029
+ }
2030
}
2031
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
2032
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["切断されました", "接続しています...", "セットアップ...", '', ''][state]); } catch (ex) {} }
views/translations/default-min_nl.handlebars
+6
-2
@@ -2009,7 +2009,7 @@
2009
var count = 0;
2010
for (var i in nodes) {
2011
var node = nodes[i], nodeid = nodes[i]._id;
2012
- if (multiDesktop[nodeid] == null) {
2012
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
2013
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
2014
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
2015
//var conn = 0;
@@ -2022,7 +2022,11 @@
2022
}
2023
2024
// Perform connect all
2025
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
2025
+ for (var i in nodes) {
2026
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
2027
+ toggleKvmDevice(nodes[i]._id);
2028
+ }
2029
+ }
2030
}
2031
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
2032
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Verbroken", "Verbinden...", "Setup...", '', ''][state]); } catch (ex) {} }
views/translations/default-min_pt.handlebars
+6
-2
@@ -2009,7 +2009,7 @@
2009
var count = 0;
2010
for (var i in nodes) {
2011
var node = nodes[i], nodeid = nodes[i]._id;
2012
- if (multiDesktop[nodeid] == null) {
2012
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
2013
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
2014
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
2015
//var conn = 0;
@@ -2022,7 +2022,11 @@
2022
}
2023
2024
// Perform connect all
2025
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
2025
+ for (var i in nodes) {
2026
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
2027
+ toggleKvmDevice(nodes[i]._id);
2028
+ }
2029
+ }
2030
}
2031
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
2032
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Desconectado", "Conectando...", "Configurando...", '', ''][state]); } catch (ex) {} }
views/translations/default_cs.handlebars
+6
-2
@@ -3061,7 +3061,7 @@
3061
var count = 0;
3062
for (var i in nodes) {
3063
var node = nodes[i], nodeid = nodes[i]._id;
3064
- if (multiDesktop[nodeid] == null) {
3064
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
3065
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
3066
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
3067
//var conn = 0;
@@ -3074,7 +3074,11 @@
3074
}
3075
3076
// Perform connect all
3077
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
3077
+ for (var i in nodes) {
3078
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
3079
+ toggleKvmDevice(nodes[i]._id);
3080
+ }
3081
+ }
3082
}
3083
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
3084
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Odpojeno", "Připojování...", "Nastavení...", '', ''][state]); } catch (ex) {} }
views/translations/default_fr.handlebars
+6
-2
@@ -3061,7 +3061,7 @@
3061
var count = 0;
3062
for (var i in nodes) {
3063
var node = nodes[i], nodeid = nodes[i]._id;
3064
- if (multiDesktop[nodeid] == null) {
3064
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
3065
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
3066
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
3067
//var conn = 0;
@@ -3074,7 +3074,11 @@
3074
}
3075
3076
// Perform connect all
3077
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
3077
+ for (var i in nodes) {
3078
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
3079
+ toggleKvmDevice(nodes[i]._id);
3080
+ }
3081
+ }
3082
}
3083
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
3084
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Débranché", "Connecting...", "Traitement...", '', ''][state]); } catch (ex) {} }
views/translations/default_ja.handlebars
+6
-2
@@ -3061,7 +3061,7 @@
3061
var count = 0;
3062
for (var i in nodes) {
3063
var node = nodes[i], nodeid = nodes[i]._id;
3064
- if (multiDesktop[nodeid] == null) {
3064
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
3065
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
3066
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
3067
//var conn = 0;
@@ -3074,7 +3074,11 @@
3074
}
3075
3076
// Perform connect all
3077
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
3077
+ for (var i in nodes) {
3078
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
3079
+ toggleKvmDevice(nodes[i]._id);
3080
+ }
3081
+ }
3082
}
3083
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
3084
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["切断されました", "接続しています...", "セットアップ...", '', ''][state]); } catch (ex) {} }
views/translations/default_nl.handlebars
+6
-2
@@ -3061,7 +3061,7 @@
3061
var count = 0;
3062
for (var i in nodes) {
3063
var node = nodes[i], nodeid = nodes[i]._id;
3064
- if (multiDesktop[nodeid] == null) {
3064
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
3065
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
3066
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
3067
//var conn = 0;
@@ -3074,7 +3074,11 @@
3074
}
3075
3076
// Perform connect all
3077
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
3077
+ for (var i in nodes) {
3078
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
3079
+ toggleKvmDevice(nodes[i]._id);
3080
+ }
3081
+ }
3082
}
3083
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
3084
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Verbroken", "Verbinden...", "Setup...", '', ''][state]); } catch (ex) {} }
views/translations/default_pt.handlebars
+6
-2
@@ -3061,7 +3061,7 @@
3061
var count = 0;
3062
for (var i in nodes) {
3063
var node = nodes[i], nodeid = nodes[i]._id;
3064
- if (multiDesktop[nodeid] == null) {
3064
+ if ((multiDesktop[nodeid] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodeid) >= 0))) {
3065
var mesh = meshes[node.meshid], meshrights = mesh.links[userinfo._id].rights;
3066
if ((meshrights & 8) || (meshrights & 256)) { // Requires remote control rights or desktop view only rights
3067
//var conn = 0;
@@ -3074,7 +3074,11 @@
3074
}
3075
3076
// Perform connect all
3077
- for (var i in nodes) { if (multiDesktop[nodes[i]._id] == null) { toggleKvmDevice(nodes[i]._id); } }
3077
+ for (var i in nodes) {
3078
+ if ((multiDesktop[nodes[i]._id] == null) && ((multiDesktopFilter.length == 0) || (multiDesktopFilter.indexOf('devid_' + nodes[i]._id) >= 0))) {
3079
+ toggleKvmDevice(nodes[i]._id);
3080
+ }
3081
+ }
3082
}
3083
function disconnectAllKvmFunction() { if (xxdialogMode) return false; for (var nodeid in multiDesktop) { multiDesktop[nodeid].Stop(); } multiDesktop = {}; }
3084
function onMultiDesktopStateChange(desk, state) { try { QH('skvmid_' + desk.shortid, ["Desconectado", "Conectando...", "Configurando...", '', ''][state]); } catch (ex) {} }