From 788b409b43b9cca1ed3b2c1815d03b871b8238ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Sat, 28 Mar 2015 15:42:44 +0100
Subject: [PATCH] fix bug when questionid shall be removed from sortOrder
---
src/main/java/de/thm/arsnova/services/QuestionService.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index ffd40cbe2..c7ad6f16a 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -211,8 +211,8 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
if (session == null) {
throw new UnauthorizedException();
}
- databaseDao.deleteQuestionWithAnswers(question);
deleteQuestionFromSortOrder(question);
+ databaseDao.deleteQuestionWithAnswers(question);
final DeleteQuestionEvent event = new DeleteQuestionEvent(this, session);
this.publisher.publishEvent(event);
@@ -904,7 +904,8 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
public void deleteQuestionFromSortOrder(Question question){
SortOrder sortOrder = databaseDao.getSortOrder(question.getSessionId(), question.getQuestionVariant(), question.getSubject());
if (sortOrder != null) {
- sortOrder.getSortOrder().remove(question.get_id());
+ List<String> tempSortOrder = sortOrder.getSortOrder().remove(question.get_id());
+ sortOrder.setSortOrder(tempSortOrder);
if (sortOrder.getSortOrder().isEmpty()) {
databaseDao.deleteSortOrder(sortOrder);
SortOrder subjectSortOrder = databaseDao.getSortOrder(sortOrder.getSessionId(), sortOrder.getQuestionVariant(), "");
--
GitLab