From a91192ecbba9345f0e9ed778d485eac095b6d1a5 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 26 Aug 2020 10:01:09 +0200 Subject: [PATCH] SEBSERV-139 fixed quiz import bug --- src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java | 2 +- .../servicelayer/authorization/impl/UserServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java index f14449fb..ea403f66 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java @@ -341,7 +341,7 @@ public class ExamForm implements TemplateComposer { ? this.restService.getRestCall(ImportAsExam.class) : this.restService.getRestCall(SaveExam.class)); - final boolean proctoringEnabled = this.restService + final boolean proctoringEnabled = importFromQuizData ? false : this.restService .getBuilder(GetProctoringSettings.class) .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId) .call() diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java index a6863793..4204ea3a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java @@ -92,7 +92,6 @@ public class UserServiceImpl implements UserService { } }; binder.registerCustomEditor(Long.class, usersInstitutionDefaultEditor); - } // 1. OAuth2Authentication strategy