From 0247140b6df1320818275455cd89e4fc0115c764 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Thu, 8 Nov 2018 10:24:51 +0100
Subject: [PATCH] Fix answer migration handling for serialization
The format for answers is now set based on the content's format.
---
.../de/thm/arsnova/model/migration/FromV2Migrator.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java b/src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java
index 281e6c3fa..e1ed4369e 100644
--- a/src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java
+++ b/src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java
@@ -229,12 +229,16 @@ public class FromV2Migrator {
}
public de.thm.arsnova.model.Answer migrate(final Answer from, final de.thm.arsnova.model.Content content) {
+ de.thm.arsnova.model.Answer answer;
if (content instanceof ChoiceQuestionContent) {
ChoiceQuestionContent choiceQuestionContent = (ChoiceQuestionContent) content;
- return migrate(from, choiceQuestionContent.getOptions(), choiceQuestionContent.isMultiple());
+ answer = migrate(from, choiceQuestionContent.getOptions(), choiceQuestionContent.isMultiple());
} else {
- return migrate(from);
+ answer = migrate(from);
}
+ answer.setFormat(content.getFormat());
+
+ return answer;
}
public ChoiceAnswer migrate(final Answer from, final List<ChoiceQuestionContent.AnswerOption> options, final boolean multiple) {
--
GitLab