From e44758f1ec38e5e193b014007a77ad56488be9e9 Mon Sep 17 00:00:00 2001 From: Daniel Gerhardt <code@dgerhardt.net> Date: Tue, 23 Aug 2016 15:53:44 +0200 Subject: [PATCH] Fix abstentions for free text answers Free text validation is no longer done for abstentions. This fixes a regression introduced in 9fc360d6c416809e538fb2fcd4b4e81fbaae4632. --- .../java/de/thm/arsnova/services/QuestionService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java index ff5c42869..c0f73137f 100644 --- a/src/main/java/de/thm/arsnova/services/QuestionService.java +++ b/src/main/java/de/thm/arsnova/services/QuestionService.java @@ -732,12 +732,12 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis Answer theAnswer = answer.generateAnswerEntity(user, question); if ("freetext".equals(question.getQuestionType())) { imageUtils.generateThumbnailImage(theAnswer); - theAnswer.setAnswerTextRaw(new String(theAnswer.getAnswerText())); + if (question.isFixedAnswer() && question.getText() != null) { + theAnswer.setAnswerTextRaw(new String(theAnswer.getAnswerText())); - if (question.isStrictMode()) { - question.checkTextStrictOptions(theAnswer); - } - if (question.isFixedAnswer()) { + if (question.isStrictMode()) { + question.checkTextStrictOptions(theAnswer); + } theAnswer.setQuestionValue(question.evaluateCorrectAnswerFixedText(theAnswer.getAnswerTextRaw())); theAnswer.setSuccessfulFreeTextAnswer(question.isSuccessfulFreeTextAnswer(theAnswer.getAnswerTextRaw())); } -- GitLab