From 0b892573a61612b02bf4c9dc4f601b2b789a944b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 16 Aug 2017 11:26:15 +0200
Subject: [PATCH] OO-2915: don't push to the next step if block in assignment
without task, reload the data model after extending the due dates of some
user
---
.../org/olat/course/nodes/gta/ui/GTAAbstractController.java | 6 +++---
.../course/nodes/gta/ui/GTACoachedGroupListController.java | 2 +-
.../nodes/gta/ui/GTACoachedParticipantListController.java | 2 +-
.../olat/course/nodes/gta/ui/GTAParticipantController.java | 2 --
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAAbstractController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAAbstractController.java
index 6292c772227..6a479fe9753 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAAbstractController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAAbstractController.java
@@ -299,9 +299,9 @@ public abstract class GTAAbstractController extends BasicController implements G
mainVC.contextPut("assignmentDueDate", dateAsString);
mainVC.contextRemove("assignmentDueDateMsg");
- if(assignedTask != null && assignedTask.getTaskStatus() == TaskProcess.assignment
- && date.compareTo(new Date()) < 0) {
- //push to the next step
+ if(assignedTask != null && StringHelper.containsNonWhitespace(assignedTask.getTaskName())
+ && assignedTask.getTaskStatus() == TaskProcess.assignment && date.compareTo(new Date()) < 0) {
+ //push to the next step if the task is blocked in assignment (it's a security)
assignedTask = gtaManager.nextStep(assignedTask, gtaNode);
}
} else if(dueDate.getMessageKey() != null) {
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupListController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupListController.java
index 057eff33801..0fa915b4dd3 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupListController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupListController.java
@@ -174,7 +174,7 @@ public class GTACoachedGroupListController extends GTACoachedListController {
public void event(UserRequest ureq, Controller source, Event event) {
if(editDueDatesCtrl == source) {
if(event == Event.DONE_EVENT) {
- //reload???
+ updateModel();
}
cmc.deactivate();
cleanUp();
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java
index 87679c87815..2f17f92779f 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedParticipantListController.java
@@ -276,7 +276,7 @@ public class GTACoachedParticipantListController extends GTACoachedListControlle
public void event(UserRequest ureq, Controller source, Event event) {
if(editDueDatesCtrl == source) {
if(event == Event.DONE_EVENT) {
- //reload???
+ updateModel();
}
cmc.deactivate();
cleanUp();
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
index 0ff8d3bfe51..0326400ca2c 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
@@ -1,6 +1,4 @@
/**
-
-
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
--
GitLab