Fixed desktop input when user as only device rights.
Ylian Saint-Hilaire committed
Apr 2, 2020 at 11:26 UTC
633f31b78d1bb97de906d69900d535091670a79d
3 files changed
+5
-5
meshagent.js
+1
-1
@@ -687,7 +687,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
687
device = nodes[0];
688
689
// This device exists, meshid given by the device must be ignored, use the server side one.
690
- if (device.meshid != obj.dbMeshKey) {
690
+ if ((device.meshid != null) && (device.meshid != obj.dbMeshKey)) {
691
obj.dbMeshKey = device.meshid;
692
obj.meshid = device.meshid.split('/')[2];
693
}
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.5.0-z",
3
+ "version": "0.5.1-a",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
views/default.handlebars
+3
-3
@@ -2777,7 +2777,7 @@
2777
if (!xxdialogMode && xxcurrentView == 11 && desktop && Q('DeskControl').checked) {
2778
// Check what keys we are allows to send
2779
if (currentNode != null) {
2780
- var meshrights = GetMeshRights(currentNode.meshid);
2780
+ var meshrights = GetNodeRights(currentNode);
2781
var inputAllowed = ((meshrights == 0xFFFFFFFF) || (((meshrights & 8) != 0) && ((meshrights & 256) == 0)));
2782
if (inputAllowed == false) return false;
2783
var limitedInputAllowed = ((meshrights != 0xFFFFFFFF) && (((meshrights & 8) != 0) && ((meshrights & 256) == 0) && ((meshrights & 4096) != 0)));
@@ -2836,7 +2836,7 @@
2836
if (!xxdialogMode && xxcurrentView == 11 && desktop && Q('DeskControl').checked) {
2837
// Check what keys we are allows to send
2838
if (currentNode != null) {
2839
- var meshrights = GetMeshRights(currentNode.meshid);
2839
+ var meshrights = GetNodeRights(currentNode);
2840
var inputAllowed = ((meshrights == 0xFFFFFFFF) || (((meshrights & 8) != 0) && ((meshrights & 256) == 0)));
2841
if (inputAllowed == false) return false;
2842
var limitedInputAllowed = ((meshrights != 0xFFFFFFFF) && (((meshrights & 8) != 0) && ((meshrights & 256) == 0) && ((meshrights & 4096) != 0)));
@@ -2870,7 +2870,7 @@
2870
if (!xxdialogMode && xxcurrentView == 11 && desktop && Q('DeskControl').checked) {
2871
// Check what keys we are allows to send
2872
if (currentNode != null) {
2873
- var meshrights = GetMeshRights(currentNode.meshid);
2873
+ var meshrights = GetNodeRights(currentNode);
2874
var inputAllowed = ((meshrights == 0xFFFFFFFF) || (((meshrights & 8) != 0) && ((meshrights & 256) == 0)));
2875
if (inputAllowed == false) return false;
2876
var limitedInputAllowed = ((meshrights != 0xFFFFFFFF) && (((meshrights & 8) != 0) && ((meshrights & 256) == 0) && ((meshrights & 4096) != 0)));