Skip to content
Snippets Groups Projects
Commit 0b892573 authored by srosse's avatar srosse
Browse files

OO-2915: don't push to the next step if block in assignment without task,...

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
parent 3ea208d0
No related branches found
No related tags found
No related merge requests found
......@@ -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) {
......
......@@ -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();
......
......@@ -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();
......
/**
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment