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-09-30 11:04:21 +02:00
commit dfd4f67f0a
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageAction.java
View file

@ -210,11 +210,7 @@ public final class PageAction {
e.getMessage(), e.getMessage(),
Utils.getErrorCauseMessage(e)); Utils.getErrorCauseMessage(e));
if (e.getCause() instanceof RestCallError) { if (e.getCause() instanceof RestCallError) {
final RestCallError cause = (RestCallError) e.getCause(); return Result.ofError((RestCallError) e.getCause());
PageAction.this.pageContext.notifyError(
PageContext.UNEXPECTED_ERROR_KEY,
cause);
return Result.ofError(cause);
} }
return Result.ofError(e); return Result.ofError(e);
} catch (final Exception e) { } catch (final Exception e) {

14
src/main/resources/config/sql/base/V2_2__insert_data_v1_0_2.sql Normal file
View file

@ -0,0 +1,14 @@
-- Additional SEB Exam Configuration Attributes
INSERT INTO configuration_attribute VALUES
(940, 'examSessionReconfigureAllow', 'CHECKBOX', null, null, null, null, 'false'),
(941, 'examSessionReconfigureConfigURL', 'TEXT_FIELD', null, null, null, null, ''),
(942, 'quitURLRestart', 'CHECKBOX', null, null, null, null, 'true'),
(943, 'allowWindowCapture', 'CHECKBOX', null, null, null, null, 'false'),
(944, 'autoQuitApplications', 'CHECKBOX', null, null, null, null, 'true'),
(945, 'blockScreenShotsLegacy', 'CHECKBOX', null, null, null, null, 'false'),
(946, 'enableAAC', 'CHECKBOX', null, null, null, null, 'true'),
(947, 'enablePrivateClipboardMacEnforce', 'CHECKBOX', null, null, null, null, 'true'),
(948, 'enablePrivateClipboardMacEnforce', 'CHECKBOX', null, null, null, null, 'false')
;