From ea858270a9936b150ab116ee449e51ffc874389b Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Thu, 6 Feb 2025 06:56:15 +0100 Subject: [PATCH] #5278 - Merge sometimes not working when switching between documents in integrated curation mode - Assign the proper source users for the new document before triggering the auto-merge in onPreparingToOpenDocumentEvent - Remove assignment of source users later onDocumentOpened --- .../ui/curation/sidebar/CurationSidebarBehavior.java | 2 ++ .../ui/curation/sidebar/CurationSidebarServiceImpl.java | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java index 5413b781540..b19d4208573 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarBehavior.java +++ b/inception/inception-ui-curation/src/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/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java index d24bb5f9e09..0e424aad245 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/CurationSidebarServiceImpl.java +++ b/inception/inception-ui-curation/src/main/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) {