From fa23debf4c8d8a5029c31df061268532441cd30a Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 27 Oct 2022 08:55:03 +0200
Subject: [PATCH] SEBSERV-358

---
 .../gui/content/monitoring/FinishedExam.java        |  2 +-
 .../monitoring/FinishedExamClientConnection.java    | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExam.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExam.java
index 0ee2f04b..90f56f21 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExam.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExam.java
@@ -202,7 +202,7 @@ public class FinishedExam implements TemplateComposer {
                 .newAction(ActionDefinition.FINISHED_EXAM_EXPORT_CSV)
                 .withEntityKey(examKey)
                 .withExec(this::exportCSV)
-                .ignoreMoveAwayFromEdit()
+                .noEventPropagation()
                 .publish();
     }
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExamClientConnection.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExamClientConnection.java
index 9cdeafb4..3dadf1cf 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExamClientConnection.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/FinishedExamClientConnection.java
@@ -281,16 +281,15 @@ public class FinishedExamClientConnection implements TemplateComposer {
                 .compose(pageContext.copyOf(content));
 
         actionBuilder
-                .newAction(ActionDefinition.FINISHED_EXAM_BACK_TO_OVERVIEW)
-                .withEntityKey(parentEntityKey)
-                .publishIf(isExamSupporter)
-
                 .newAction(ActionDefinition.FINISHED_EXAM_CLIENT_EXPORT_CSV)
                 .withEntityKey(entityKey)
                 .withExec(this::exportCSV)
-                .ignoreMoveAwayFromEdit()
-                .publish();
-        ;
+                .noEventPropagation()
+                .publishIf(isExamSupporter)
+
+                .newAction(ActionDefinition.FINISHED_EXAM_BACK_TO_OVERVIEW)
+                .withEntityKey(parentEntityKey)
+                .publishIf(isExamSupporter);
     }
 
     private String getClientTime(final ClientEvent event) {