Relaxing check for HW Connect button for AMT only device group.
Relaxing check for HW Connect button for AMT only device group.
jsastriawan committed
Aug 20, 2020 at 14:14 UTC
f2dfc4635e3f8b4ecc38b94a0da8cd86a98526b9
1 file changed
+30
-15
views/default.handlebars
+30
-15
@@ -6478,19 +6478,29 @@
6478
// Show the right buttons
6479
QV('disconnectbutton1span', (deskState != 0));
6480
QV('connectbutton1span', (deskState == 0) && ((rights & 8) || (rights & 256)) && (currentNode.agent != null) && (currentNode.agent.caps & 1));
6481
- QV('connectbutton1hspan',
6482
- (deskState == 0) &&
6483
- (rights & 8) &&
6484
- (
6485
- ((currentNode.intelamt != null) &&
6486
- (currentNode.intelamt.state == 2) &&
6487
- (currentNode.intelamt.ver != null) &&
6488
- ((currentNode.intelamt.sku == null) ||
6489
- ((typeof currentNode.intelamt.sku == 'number') &&
6490
- ((currentNode.intelamt.sku & 8) != 0))))
6491
- )
6492
- );
6493
-
6481
+ if (mesh.mtype == 1) {
6482
+ QV('connectbutton1hspan',
6483
+ (deskState == 0) &&
6484
+ (rights & 8) &&
6485
+ (
6486
+ ((currentNode.intelamt != null) &&
6487
+ (currentNode.intelamt.state == 2))
6488
+ )
6489
+ );
6490
+ } else {
6491
+ QV('connectbutton1hspan',
6492
+ (deskState == 0) &&
6493
+ (rights & 8) &&
6494
+ (
6495
+ ((currentNode.intelamt != null) &&
6496
+ (currentNode.intelamt.state == 2) &&
6497
+ (currentNode.intelamt.ver != null) &&
6498
+ ((currentNode.intelamt.sku == null) ||
6499
+ ((typeof currentNode.intelamt.sku == 'number') &&
6500
+ ((currentNode.intelamt.sku & 8) != 0))))
6501
+ )
6502
+ );
6503
+ }
6504
// Show the right settings
6505
QV('d7amtkvm', (currentNode.intelamt != null && ((currentNode.intelamt.ver != null) || (currentNode.agent == null))) && ((deskState == 0) || (desktop.contype == 2)));
6506
QV('d7meshkvm', (webRtcDesktop) || ((currentNode.agent != null) && (currentNode.agent.caps & 1) && ((deskState == false) || (desktop.contype == 1))));
@@ -7356,8 +7366,13 @@
7366
// Show the right buttons
7367
QV('disconnectbutton2span', (termState == true));
7368
QV('connectbutton2span', (termState == false) && (currentNode.agent != null) && (currentNode.agent.caps & 2));
7359
- QV('connectbutton2hspan', (termState == false) && (terminalNode.intelamt != null) && (terminalNode.intelamt.state == 2) && (terminalNode.intelamt.ver != null));
7360
- QV('terminalSizeDropDown', (termState == false) && (terminalNode.intelamt != null) && (terminalNode.intelamt.state == 2) && (terminalNode.intelamt.ver != null));
7369
+ if (mesh.mtype == 1) {
7370
+ QV('connectbutton2hspan', (termState == false) && (terminalNode.intelamt != null) && (terminalNode.intelamt.state == 2));
7371
+ QV('terminalSizeDropDown', (termState == false) && (terminalNode.intelamt != null) && (terminalNode.intelamt.state == 2));
7372
+ } else {
7373
+ QV('connectbutton2hspan', (termState == false) && (terminalNode.intelamt != null) && (terminalNode.intelamt.state == 2) && (terminalNode.intelamt.ver != null));
7374
+ QV('terminalSizeDropDown', (termState == false) && (terminalNode.intelamt != null) && (terminalNode.intelamt.state == 2) && (terminalNode.intelamt.ver != null));
7375
+ }
7376
7377
// Enable buttons
7378
var online = ((terminalNode.conn & 1) != 0); // If Agent (1) connected, enable Terminal