From 7a09a424ba570cc9bd762ac154e08a3661af75b3 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 25 Jun 2015 12:18:29 +0200
Subject: [PATCH] OO-1574: fix the red screen if the task definition is not
available
---
.../nodes/gta/ui/GTAAssignedTaskController.java | 14 +++++++++-----
.../java/org/olat/group/ui/_content/bgform.html | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignedTaskController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignedTaskController.java
index 2bdbab0231d..1a71cb27edc 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignedTaskController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignedTaskController.java
@@ -48,9 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
*
*/
public class GTAAssignedTaskController extends BasicController {
-
-
-
+
private final Link downloadButton, downloadLink;
private final File taskFile;
@@ -87,9 +85,15 @@ public class GTAAssignedTaskController extends BasicController {
downloadButton.setTarget("_blank");
downloadLink = LinkFactory.createCustomLink("download.link", "download.link", null, Link.NONTRANSLATED, mainVC, this);
- downloadLink.setCustomDisplayText(StringHelper.escapeHtml(taskDef.getTitle()));
+ if(taskDef != null) {
+ downloadLink.setCustomDisplayText(StringHelper.escapeHtml(taskDef.getTitle()));
+ downloadLink.setIconLeftCSS("o_icon " + cssIcon);
+ } else {
+ downloadLink.setCustomDisplayText(StringHelper.escapeHtml(taskFile.getName()));
+ downloadLink.setIconLeftCSS("o_icon " + cssIcon + " o_icon_warning");
+ downloadLink.setEnabled(false);
+ }
downloadLink.setTitle(taskInfos);
- downloadLink.setIconLeftCSS("o_icon " + cssIcon);
downloadLink.setTarget("_blank");
putInitialPanel(mainVC);
diff --git a/src/main/java/org/olat/group/ui/_content/bgform.html b/src/main/java/org/olat/group/ui/_content/bgform.html
index 62b6077433c..689cf80e339 100644
--- a/src/main/java/org/olat/group/ui/_content/bgform.html
+++ b/src/main/java/org/olat/group/ui/_content/bgform.html
@@ -1,4 +1,4 @@
#if($bulkMode)
-$r.translate("create.form.bulkmode.bgnames")
+<div class="o_info">$r.translate("create.form.bulkmode.bgnames")</div>
#end
$r.render("groupForm")
\ No newline at end of file
--
GitLab