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

Merge remote-tracking branch 'origin/dev-1.5' into development

Browse source
This commit is contained in:
anhefti 2023-06-14 15:38:32 +02:00
commit 076a54a2c7
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java
View file

@ -643,12 +643,14 @@ public class ExamSessionServiceImpl implements ExamSessionService {
final ClientConnectionDataInternal cc = this.examSessionCacheService.getClientConnection(token); final ClientConnectionDataInternal cc = this.examSessionCacheService.getClientConnection(token);
if (cc.clientConnection.status.duplicateCheckStatus) { if (cc.clientConnection.status.duplicateCheckStatus) {
final Long id = this.duplicateCheck.put( if (cc.clientConnection.userSessionId != null) {
cc.clientConnection.userSessionId, final Long id = this.duplicateCheck.put(
cc.getConnectionId()); cc.clientConnection.userSessionId,
if (id != null) { cc.getConnectionId());
duplicates.add(id); if (id != null) {
duplicates.add(cc.getConnectionId()); duplicates.add(id);
duplicates.add(cc.getConnectionId());
}
} }
} }
return cc; return cc;

6
src/main/resources/messages.properties
View file

@ -675,14 +675,14 @@ sebserver.exam.configuration.form.title.new=Add exam configuration mapping
sebserver.exam.configuration.form.title=Exam Configuration Mapping sebserver.exam.configuration.form.title=Exam Configuration Mapping
sebserver.exam.configuration.form.name=Exam Configuration sebserver.exam.configuration.form.name=Exam Configuration
sebserver.exam.configuration.form.name.tooltip=Please select an exam configuration to attach to the exam sebserver.exam.configuration.form.name.tooltip=Please select an exam configuration to attach to the exam
sebserver.exam.configuration.form.encryptSecret=Encryption Password sebserver.exam.configuration.form.encryptSecret=Settings Password
sebserver.exam.configuration.form.encryptSecret.tooltip=Define an encryption password if the exam configuration should be encrypted by password sebserver.exam.configuration.form.encryptSecret.tooltip=Define an encryption password if the exam configuration settings should be encrypted by password
sebserver.exam.configuration.form.description=Description sebserver.exam.configuration.form.description=Description
sebserver.exam.configuration.form.description.tooltip=The description of the selected exam configuration sebserver.exam.configuration.form.description.tooltip=The description of the selected exam configuration
sebserver.exam.configuration.form.status=Status sebserver.exam.configuration.form.status=Status
sebserver.exam.configuration.form.status.tooltip=The current status of the selected exam configuration sebserver.exam.configuration.form.status.tooltip=The current status of the selected exam configuration
sebserver.exam.configuration.form.encryptSecret.confirm=Confirm Password sebserver.exam.configuration.form.encryptSecret.confirm=Confirm Password
sebserver.exam.configuration.form.encryptSecret.confirm.tooltip=Please confirm the encryption password if there is one sebserver.exam.configuration.form.encryptSecret.confirm.tooltip=Please confirm the settings password if there is one
sebserver.exam.indicator.list.actions=  sebserver.exam.indicator.list.actions= 
sebserver.exam.indicator.list.title=Indicators sebserver.exam.indicator.list.title=Indicators