From 5abcf2c7da9826d52da69440f218bb0eb4db4f22 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 2 Dec 2020 12:03:06 +0100
Subject: [PATCH] OO-5121: Show link to remove participants again

---
 .../appointments/ui/AppointmentDataModel.java       |  2 ++
 .../appointments/ui/AppointmentListController.java  |  5 ++++-
 .../modules/appointments/ui/AppointmentRow.java     | 13 +++++++++++++
 .../appointments/ui/_content/appointment_row.html   |  3 +++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/olat/modules/appointments/ui/AppointmentDataModel.java b/src/main/java/org/olat/modules/appointments/ui/AppointmentDataModel.java
index 6369b6f1693..39542055857 100644
--- a/src/main/java/org/olat/modules/appointments/ui/AppointmentDataModel.java
+++ b/src/main/java/org/olat/modules/appointments/ui/AppointmentDataModel.java
@@ -120,6 +120,7 @@ implements SortableFlexiTableDataModel<AppointmentRow>, FilterableFlexiTableMode
 			case select: return row.getSelectLink();
 			case addUser: return row.getAddUserLink();
 			case removeUser: return row.getRemoveLink();
+			case exportParticipants: return row.getExportLink();
 			case confirm: return row.getConfirmLink();
 			case delete: return row.getDeleteLink();
 			case edit: return row.getEditLink();
@@ -147,6 +148,7 @@ implements SortableFlexiTableDataModel<AppointmentRow>, FilterableFlexiTableMode
 		select("select"),
 		addUser("add.user"),
 		removeUser("remove.user"),
+		exportParticipants("export.participations"),
 		confirm("confirm"),
 		edit("edit"),
 		delete("delete");
diff --git a/src/main/java/org/olat/modules/appointments/ui/AppointmentListController.java b/src/main/java/org/olat/modules/appointments/ui/AppointmentListController.java
index 23c93acb538..8c93f3fea79 100644
--- a/src/main/java/org/olat/modules/appointments/ui/AppointmentListController.java
+++ b/src/main/java/org/olat/modules/appointments/ui/AppointmentListController.java
@@ -231,6 +231,9 @@ public abstract class AppointmentListController extends FormBasicController impl
 			DefaultFlexiColumnModel removeModel = new DefaultFlexiColumnModel(AppointmentCols.removeUser);
 			removeModel.setExportable(false);
 			columnsModel.addFlexiColumnModel(removeModel);
+			DefaultFlexiColumnModel exportModel = new DefaultFlexiColumnModel(AppointmentCols.exportParticipants);
+			exportModel.setExportable(false);
+			columnsModel.addFlexiColumnModel(exportModel);
 			DefaultFlexiColumnModel deleteModel = new DefaultFlexiColumnModel(AppointmentCols.delete);
 			deleteModel.setExportable(false);
 			columnsModel.addFlexiColumnModel(deleteModel);
@@ -411,7 +414,7 @@ public abstract class AppointmentListController extends FormBasicController impl
 	protected void forgeExportUserLink(AppointmentRow row) {
 		FormLink link = uifactory.addFormLink("export_" + row.getKey(), CMD_EXPORT, "export", null, null, Link.LINK);
 		link.setUserObject(row);
-		row.setRemoveLink(link);
+		row.setExportLink(link);
 	}
 	
 	protected void forgeDeleteLink(AppointmentRow row) {
diff --git a/src/main/java/org/olat/modules/appointments/ui/AppointmentRow.java b/src/main/java/org/olat/modules/appointments/ui/AppointmentRow.java
index 3365bb6a28f..03755a97790 100644
--- a/src/main/java/org/olat/modules/appointments/ui/AppointmentRow.java
+++ b/src/main/java/org/olat/modules/appointments/ui/AppointmentRow.java
@@ -55,6 +55,7 @@ public class AppointmentRow {
 	private FormLink selectLink;
 	private FormLink addUserLink;
 	private FormLink removeLink;
+	private FormLink exportLink;
 	private FormLink confirmLink;
 	private FormLink deleteLink;
 	private FormLink editLink;
@@ -236,6 +237,18 @@ public class AppointmentRow {
 		this.removeLink = removeLink;
 	}
 	
+	public FormLink getExportLink() {
+		return exportLink;
+	}
+
+	public String getExportLinkName() {
+		return exportLink != null? exportLink.getName(): null;
+	}
+
+	public void setExportLink(FormLink exportLink) {
+		this.exportLink = exportLink;
+	}
+	
 	public FormLink getConfirmLink() {
 		return confirmLink;
 	}
diff --git a/src/main/java/org/olat/modules/appointments/ui/_content/appointment_row.html b/src/main/java/org/olat/modules/appointments/ui/_content/appointment_row.html
index 4a007aab819..bce622f452a 100644
--- a/src/main/java/org/olat/modules/appointments/ui/_content/appointment_row.html
+++ b/src/main/java/org/olat/modules/appointments/ui/_content/appointment_row.html
@@ -93,6 +93,9 @@
 					#if($row.removeLinkName)
 						&nbsp;$r.render($row.removeLinkName)
 					#end
+					#if($row.exportLinkName)
+						&nbsp;$r.render($row.exportLinkName)
+					#end
 					#if($row.deleteLinkName)
 						&nbsp;$r.render($row.deleteLinkName)
 					#end
-- 
GitLab