From 56841dde21b2cbd3764f5635032a5192e8502d7c Mon Sep 17 00:00:00 2001
From: agrt56 <andreas.gaertner@mni.thm.de>
Date: Tue, 12 May 2015 17:06:46 +0200
Subject: [PATCH] Task #15814: Set question active if voting admission is
given.
---
.../de/thm/arsnova/services/QuestionService.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index dca2ad7c6..6d50b8ad7 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -327,12 +327,18 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
@Override
@PreAuthorize("isAuthenticated() and hasPermission(#questionId, 'question', 'owner')")
- public void setVotingAdmission(final String questionId, final boolean disable) {
+ public void setVotingAdmission(final String questionId, final boolean disableVoting) {
final Question question = databaseDao.getQuestion(questionId);
final Session session = databaseDao.getSessionFromKeyword(question.getSessionKeyword());
- question.setVotingDisabled(disable);
+ question.setVotingDisabled(disableVoting);
- databaseDao.updateQuestion(question);
+ if (disableVoting == false && !question.isActive()) {
+ question.setActive(true);
+ update(question);
+ } else {
+ databaseDao.updateQuestion(question);
+ }
+
this.publisher.publishEvent(new LockVotingEvent(this, session, question));
}
--
GitLab