From 46fd087e4bbba544fb9544befb6a03ef1d3d7518 Mon Sep 17 00:00:00 2001
From: tekay <tom.kaesler@mni.thm.de>
Date: Fri, 19 Feb 2016 10:19:11 +0100
Subject: [PATCH] fix bool triggers in session export (and copytopublicpool)
Conflicts:
src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 4 ++--
src/main/java/de/thm/arsnova/dao/IDatabaseDao.java | 2 +-
src/main/java/de/thm/arsnova/services/SessionService.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 391d8c8de..b28b911cd 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -2190,7 +2190,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
}
@Override
- public ImportExportSession exportSession(String sessionkey, Boolean withAnswerStatistics, Boolean withFeedbackQuestions, Boolean withAnswers) {
+ public ImportExportSession exportSession(String sessionkey, Boolean withAnswers, Boolean withFeedbackQuestions) {
ImportExportSession ies = new ImportExportSession();
Session session = getDatabaseDao().getSessionFromKeyword(sessionkey);
ies.setSessionFromSessionObject(session);
@@ -2223,7 +2223,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
}
ies.setFeedbackQuestions(iL);
}
- if (withAnswerStatistics) {
+ if (withAnswers) {
ies.setSessionInfo(this.calculateSessionInfo(ies, session));
}
ies.setMotds(getDatabaseDao().getMotdsForSession(session.getKeyword()));
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 26c9e2c5c..b7a633194 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -207,7 +207,7 @@ public interface IDatabaseDao {
SessionInfo importSession(User user, ImportExportSession importSession);
- ImportExportSession exportSession(String sessionkey, Boolean withAnswerStatistics, Boolean withFeedbackQuestions, Boolean withAnswers);
+ ImportExportSession exportSession(String sessionkey, Boolean withAnswer, Boolean withFeedbackQuestions);
Statistics getStatistics();
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 1acbeeb50..4e31e995e 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -407,13 +407,13 @@ public class SessionService implements ISessionService, ApplicationEventPublishe
@Override
@PreAuthorize("isAuthenticated() and hasPermission(#sessionkey, 'session', 'owner')")
public ImportExportSession exportSession(String sessionkey, Boolean withAnswerStatistics, Boolean withFeedbackQuestions) {
- return databaseDao.exportSession(sessionkey, withAnswerStatistics, withFeedbackQuestions, true);
+ return databaseDao.exportSession(sessionkey, withAnswerStatistics, withFeedbackQuestions);
}
@Override
@PreAuthorize("isAuthenticated() and hasPermission(#sessionkey, 'session', 'owner')")
public SessionInfo copySessionToPublicPool(String sessionkey, de.thm.arsnova.entities.transport.ImportExportSession.PublicPool pp) {
- ImportExportSession temp = databaseDao.exportSession(sessionkey, false, false, false);
+ ImportExportSession temp = databaseDao.exportSession(sessionkey, false, false);
temp.getSession().setPublicPool(pp);
final User user = userService.getCurrentUser();
return databaseDao.importSession(user, temp);
--
GitLab