zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-376 wrong status color when ASK is not enabled

Browse source
This commit is contained in:
anhefti 2023-02-22 10:20:53 +01:00
parent 52d41050d2
commit a99e8fb637
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java
View file

@ -482,12 +482,12 @@ public final class ClientConnectionTable implements FullPageMonitoringGUIUpdate
@Override
public boolean grantChecked() {
return this.monitoringData.grantChecked;
return !ClientConnectionTable.this.checkSecurityGrant || this.monitoringData.grantChecked;
}
@Override
public boolean grantDenied() {
return this.monitoringData.grantDenied;
return ClientConnectionTable.this.checkSecurityGrant && this.monitoringData.grantDenied;
}
@Override

20
src/main/java/ch/ethz/seb/sebserver/gui/service/session/ColorData.java
View file

@ -14,7 +14,6 @@ import org.eclipse.swt.widgets.Display;
import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus;
import ch.ethz.seb.sebserver.gbl.model.session.ClientMonitoringDataView;
import ch.ethz.seb.sebserver.gbl.util.Utils;
public class ColorData {
@ -45,15 +44,11 @@ public class ColorData {
case CONNECTION_REQUESTED:
case AUTHENTICATED:
case ACTIVE: {
final int incidentFlag = entry.incidentFlag();
if (incidentFlag > 0) {
if ((incidentFlag & ClientMonitoringDataView.FLAG_GRANT_DENIED) > 0) {
return this.color3;
}
if ((incidentFlag & (ClientMonitoringDataView.FLAG_GRANT_NOT_CHECKED
| ClientMonitoringDataView.FLAG_MISSING_PING)) > 0) {
return this.color2;
}
if (entry.grantDenied()) {
return this.color3;
}
if (!entry.grantChecked() || entry.hasMissingPing()) {
return this.color2;
}
return this.color1;
}
@ -80,8 +75,9 @@ public class ColorData {
return 1;
}
case ACTIVE: {
if (entry.incidentFlag() > 0) {
return -1;
final int incidentFlag = entry.incidentFlag();
if (incidentFlag > 0) {
return -incidentFlag;
}
return 2;
}