From e3ab090abf3ce92239bfdbe503b15ae3ce415dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Thu, 26 Mar 2015 16:19:55 +0100
Subject: [PATCH] fix Parameter in getQuestionSortType and getSubjectSortType;
Function expected the questionVariant, instead got a boolean(in a String)
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 2 +-
.../de/thm/arsnova/services/QuestionService.java | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 22ccbc5b9..e2a454bc5 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -2015,7 +2015,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
ViewResults results = this.getDatabase().view(view);
- if (results.getResults().isEmpty()) {
+ if (results == null || results.getResults() == null) {
return null;
}
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 98b5b7de8..8194aba9c 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -844,7 +844,11 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
@Override
public String getSubjectSortType(String sessionkey, String isPreparation) {
- SortOrder sortOrder = databaseDao.getSortOrder(sessionkey, isPreparation, "");
+ String questionVariant = "lecture";
+ if ("true".equals(isPreparation)) {
+ questionVariant = "preparation";
+ }
+ SortOrder sortOrder = databaseDao.getSortOrder(sessionkey, questionVariant, "");
return sortOrder.getSortType();
}
@@ -871,7 +875,11 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
@Override
public String getQuestionSortType(String sessionkey, String isPreparation, String subject) {
- SortOrder sortOrder = databaseDao.getSortOrder(sessionkey, isPreparation, subject);
+ String questionVariant = "lecture";
+ if ("true".equals(isPreparation)) {
+ questionVariant = "preparation";
+ }
+ SortOrder sortOrder = databaseDao.getSortOrder(sessionkey, questionVariant, subject);
return sortOrder.getSortType();
}
--
GitLab