diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index 391d8c8de948097035551f8ca69adc9a0608e93e..b28b911cd25c4591b603efd1f49cae249620e25f 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 26c9e2c5c79785a87bf98c1096590816fc609e5e..b7a6331940d0b87f77c2c75611d16006a274cf9d 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 1acbeeb50f03dab2f5bab8bac20f0e17c8e756bd..4e31e995e7fb5d51977c5e5e8d9fb6c6d3b51c6f 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);