Merge pull request #5279 from inception-project/bugfix/5278-Merge-som…

…etimes-not-working-when-switching-between-documents-in-integrated-curation-mode #5278 - Merge sometimes not working when switching between documents in integrated curation mode
inception-project · Feb 6, 2025 · 7207b81 · 7207b81
2 parents 915040e + ea85827
commit 7207b81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/...c/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java b/...c/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java
@@ -132,6 +132,8 @@ private void onPreparingToOpenDocumentEvent(PreparingToOpenDocumentEvent aEvent)
         handleSessionActivationPageParameters(page, params, doc, sessionOwner);
 
         ensureDataOwnerMatchesCurationTarget(page, project, sessionOwner, dataOwner);
+        curationSidebarService.setDefaultSelectedUsersForDocument(aEvent.getSessionOwner(),
+                aEvent.getDocument());
 
         var prefs = preferencesService
                 .loadDefaultTraitsForProject(KEY_CURATION_SIDEBAR_MANAGER_PREFS, project);

diff --git a/...ain/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java b/...ain/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java
@@ -58,7 +58,6 @@
 import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument;
 import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
 import de.tudarmstadt.ukp.clarin.webanno.security.model.User;
-import de.tudarmstadt.ukp.inception.annotation.events.DocumentOpenedEvent;
 import de.tudarmstadt.ukp.inception.curation.merge.strategy.MergeStrategyFactory;
 import de.tudarmstadt.ukp.inception.curation.model.CurationSettings;
 import de.tudarmstadt.ukp.inception.curation.model.CurationSettingsId;
@@ -357,13 +356,6 @@ public void closeSession(String aSessionOwner, long aProjectId)
         }
     }
 
-    @EventListener
-    @Transactional
-    public void onDocumentOpened(DocumentOpenedEvent aEvent)
-    {
-        setDefaultSelectedUsersForDocument(aEvent.getSessionOwner(), aEvent.getDocument());
-    }
-
     @Override
     public void setDefaultSelectedUsersForDocument(String aSessionOwner, SourceDocument aDocument)
     {