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

OO-3757: allow task without assignments to be logged

parent 80c657ad
No related branches found
No related tags found
No related merge requests found
......@@ -1684,7 +1684,7 @@ public class GTAManagerImpl implements GTAManager {
public void log(String step, String operation, Task assignedTask, Identity actor, Identity assessedIdentity, BusinessGroup assessedGroup,
CourseEnvironment courseEnv, GTACourseNode cNode, Role by) {
//log
String taskName = StringHelper.containsNonWhitespace(assignedTask.getTaskName()) ? assignedTask.getTaskName() : assignedTask.getKey().toString();
String taskName = taskToString(assignedTask);
String msg = step + " of " + taskName + ": " + operation;
if(GTAType.group.name().equals(cNode.getModuleConfiguration().getStringValue(GTACourseNode.GTASK_TYPE))) {
log.audit(msg + " to business group: " + assessedGroup.getName(), null);
......@@ -1703,7 +1703,7 @@ public class GTAManagerImpl implements GTAManager {
String operation = event.getLogMessage();
String file = event.getFilename();
//log
String taskName = StringHelper.containsNonWhitespace(assignedTask.getTaskName()) ? assignedTask.getTaskName() : assignedTask.getKey().toString();
String taskName = taskToString(assignedTask);
String msg = step + " of " + taskName + ": " + operation + " " + file;
if(GTAType.group.name().equals(cNode.getModuleConfiguration().getStringValue(GTACourseNode.GTASK_TYPE))) {
log.audit(msg + " to business group: " + assessedGroup.getName(), null);
......@@ -1716,6 +1716,20 @@ public class GTAManagerImpl implements GTAManager {
}
}
private String taskToString(Task assignedTask) {
String name;
if(assignedTask == null ) {
name = "no assignment";
} else if(StringHelper.containsNonWhitespace(assignedTask.getTaskName())) {
name = assignedTask.getTaskName();
} else if(assignedTask.getKey() != null) {
name = assignedTask.getKey().toString();
} else {
name = "no assignment";
}
return name;
}
private interface TaskListSynched {
public void sync();
......
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