From 5edf9e8b644dc3ec19f4abdd4c6bab827e3a6069 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 8 May 2019 08:36:38 +0200
Subject: [PATCH] OO-4047: remove text feedback in editor if text is empty
---
.../editor/AssessmentTestFeedbackEditorController.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java
index 8b98737ccec..5daf12c619c 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java
@@ -131,24 +131,30 @@ public class AssessmentTestFeedbackEditorController extends FormBasicController
String passedTitle = feedbackPassedTitleEl.getValue();
String passedText = feedbackPassedTextEl.getRawValue();
+ TestFeedbackBuilder passedBuilder = testBuilder.getPassedFeedback();
if(StringHelper.containsNonWhitespace(FilterFactory.getHtmlTagsFilter().filter(passedText))) {
- TestFeedbackBuilder passedBuilder = testBuilder.getPassedFeedback();
if(passedBuilder == null) {
passedBuilder = testBuilder.createPassedFeedback();
}
passedBuilder.setTitle(passedTitle);
passedBuilder.setText(passedText);
+ } else if(passedBuilder != null) {
+ passedBuilder.setTitle(null);
+ passedBuilder.setText(null);
}
String failedTitle = feedbackFailedTitleEl.getValue();
String failedText = feedbackFailedTextEl.getRawValue();
+ TestFeedbackBuilder failedBuilder = testBuilder.getFailedFeedback();
if(StringHelper.containsNonWhitespace(FilterFactory.getHtmlTagsFilter().filter(failedText))) {
- TestFeedbackBuilder failedBuilder = testBuilder.getFailedFeedback();
if(failedBuilder == null) {
failedBuilder = testBuilder.createFailedFeedback();
}
failedBuilder.setTitle(failedTitle);
failedBuilder.setText(failedText);
+ } else if(failedBuilder != null) {
+ failedBuilder.setTitle(null);
+ failedBuilder.setText(null);
}
fireEvent(ureq, AssessmentTestEvent.ASSESSMENT_TEST_CHANGED_EVENT);
--
GitLab