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

Merge remote-tracking branch 'origin/patch-1.0.2' into development

Browse source
This commit is contained in:
anhefti 2020-11-17 12:36:59 +01:00
commit 61cd109ff2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java
View file

@ -22,6 +22,7 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport; import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
import ch.ethz.seb.sebserver.gui.service.page.ComposerService; import ch.ethz.seb.sebserver.gui.service.page.ComposerService;
@ -146,7 +147,7 @@ public class ComposerServiceImpl implements ComposerService {
final MessageBox logoutSuccess = new Message( final MessageBox logoutSuccess = new Message(
pageContext.getShell(), pageContext.getShell(),
this.i18nSupport.getText("sebserver.logout"), this.i18nSupport.getText("sebserver.logout"),
this.i18nSupport.getText("sebserver.logout.invalid-session.message"), Utils.formatLineBreaks(this.i18nSupport.getText("sebserver.logout.invalid-session.message")),
SWT.ICON_INFORMATION, SWT.ICON_INFORMATION,
this.i18nSupport); this.i18nSupport);
logoutSuccess.open(null); logoutSuccess.open(null);

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

@ -296,12 +296,12 @@ public final class ClientConnectionTable {
} }
public void updateValues() { public void updateValues() {
if (this.statusFilterChanged) { if (this.statusFilterChanged || this.forceUpdateAll) {
this.toDelete.clear(); this.toDelete.clear();
this.toDelete.addAll(this.tableMapping.keySet()); this.toDelete.addAll(this.tableMapping.keySet());
} }
this.restCallBuilder this.restCallBuilder
.withHeader(API.EXAM_MONITORING_STATE_FILTER, (this.forceUpdateAll) ? "" : this.statusFilterParam) .withHeader(API.EXAM_MONITORING_STATE_FILTER, this.statusFilterParam)
.call() .call()
.get(error -> { .get(error -> {
log.error("Error poll connection data: ", error); log.error("Error poll connection data: ", error);
@ -312,7 +312,7 @@ public final class ClientConnectionTable {
data.getConnectionId(), data.getConnectionId(),
UpdatableTableItem::new); UpdatableTableItem::new);
tableItem.push(data); tableItem.push(data);
if (this.statusFilterChanged) { if (this.statusFilterChanged || this.forceUpdateAll) {
this.toDelete.remove(data.getConnectionId()); this.toDelete.remove(data.getConnectionId());
} }
}); });