From f6a15a4b25eaebe9c392f7c9478f19ce80b36f3b Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 23 Nov 2020 14:17:11 +0100
Subject: [PATCH] OO-5098: prefer nickname to name in archive for GTA
---
src/main/java/org/olat/course/nodes/GTACourseNode.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/GTACourseNode.java b/src/main/java/org/olat/course/nodes/GTACourseNode.java
index aee89890f6c..b894b274993 100644
--- a/src/main/java/org/olat/course/nodes/GTACourseNode.java
+++ b/src/main/java/org/olat/course/nodes/GTACourseNode.java
@@ -47,6 +47,7 @@ import org.olat.core.gui.translator.Translator;
import org.olat.core.id.Identity;
import org.olat.core.id.Organisation;
import org.olat.core.id.Roles;
+import org.olat.core.id.User;
import org.olat.core.logging.Tracing;
import org.olat.core.util.ExportUtil;
import org.olat.core.util.FileUtils;
@@ -631,9 +632,10 @@ public class GTACourseNode extends AbstractAccessableCourseNode {
ModuleConfiguration config = getModuleConfiguration();
GTAManager gtaManager = CoreSpringFactory.getImpl(GTAManager.class);
- String name = assessedIdentity.getUser().getLastName()
- + "_" + assessedIdentity.getUser().getFirstName()
- + "_" + assessedIdentity.getName();
+ User user = assessedIdentity.getUser();
+ String name = user.getLastName()
+ + "_" + user.getFirstName()
+ + "_" + (StringHelper.containsNonWhitespace(user.getNickName()) ? user.getNickName() : assessedIdentity.getName());
int flow = 0;//for beautiful ordering
String userDirName = dirName + "/" + StringHelper.transformDisplayNameToFileSystemName(name);
--
GitLab