From 5107f4db6ba7548c60ccdfb5fc006939d6e0f8e8 Mon Sep 17 00:00:00 2001
From: Jan Sladek <Jan.Sladek@mni.thm.de>
Date: Wed, 11 Mar 2015 21:32:09 +0100
Subject: [PATCH] Worked on #15326. Added my forgotten HttpServletResponse into
the controller method.
---
.../thm/arsnova/controller/LecturerQuestionController.java | 6 ++++--
src/main/java/de/thm/arsnova/services/QuestionService.java | 6 ++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index d3a738648..5d59c1ae5 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -344,7 +344,8 @@ public class LecturerQuestionController extends AbstractController {
@RequestMapping(value = "/{questionId}/thumbs", method = RequestMethod.POST)
public ThumbnailResponse getThumbnails(
@PathVariable final String questionId,
- @RequestBody final ThumbnailRequest thumbRequest
+ @RequestBody final ThumbnailRequest thumbRequest,
+ final HttpServletResponse response
) {
return questionService.getThumbnails(questionId, thumbRequest);
@@ -353,7 +354,8 @@ public class LecturerQuestionController extends AbstractController {
@RequestMapping(value = "/{questionId}/answer/{answerId}/image", method = RequestMethod.GET)
public String getImage(
@PathVariable final String questionId,
- @PathVariable final String answerId
+ @PathVariable final String answerId,
+ final HttpServletResponse response
) {
return questionService.getImage(questionId, answerId);
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 59a101197..d68470f90 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -540,6 +540,9 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
}
Answer theAnswer = answer.generateAnswerEntity(user, question);
+ if ("freetext".equals(theAnswer.getType())) {
+ ImageUtils.generateThumbnailImage(theAnswer);
+ }
return databaseDao.saveAnswer(theAnswer, user, question, getSession(question.getSessionKeyword()));
}
@@ -554,6 +557,9 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
}
final Question question = getQuestion(answer.getQuestionId());
+ if ("freetext".equals(answer.getType())) {
+ ImageUtils.generateThumbnailImage(answer);
+ }
final Answer result = databaseDao.updateAnswer(realAnswer);
final Session session = databaseDao.getSessionFromKeyword(question.getSessionKeyword());
this.publisher.publishEvent(new NewAnswerEvent(this, session, result, user, question));
--
GitLab