Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-merging via the curation sidebar always uses the project settings instead of the dialog settings #4762

Closed
reckart opened this issue Apr 24, 2024 · 0 comments
Closed

Re-merging via the curation sidebar always uses the project settings instead of the dialog settings #4762

reckart opened this issue Apr 24, 2024 · 0 comments
Assignees
@reckart
Labels
🐛Bug Something isn't working Module: Curation
Milestone
32.1

Comments

@reckart
Copy link
Member

reckart commented Apr 24, 2024

Describe the bug
Re-merging via the curation sidebar always uses the project settings instead of the dialog settings.

To Reproduce
Steps to reproduce the behavior:

  1. Use the re-merge button from the curation sidebar
  2. Select a strategy different from the default project strategy
  3. Run the merge
  4. Observe that the flash message still mentions the strategy from the project default

Expected behavior
The dialog settings should be used.

Please complete the following information:

  • Version and build ID: 32.0
@reckart reckart added 🐛Bug Something isn't working Module: Curation labels Apr 24, 2024
@reckart reckart added this to the 32.1 milestone Apr 24, 2024
@reckart reckart self-assigned this Apr 24, 2024
reckart added a commit that referenced this issue Apr 24, 2024
@reckart
#4762 - Re-merging via the curation sidebar always uses the project s…
d14e58c 
…ettings instead of the dialog settings

- Pass the dialog settings on to the merge operation
reckart added a commit that referenced this issue Apr 24, 2024
@reckart
Merge pull request #4763 from inception-project/bugfix/4762-Re-mergin…
9db2487 
…g-via-the-curation-sidebar-always-uses-the-project-settings-instead-of-the-dialog-settings

#4762 - Re-merging via the curation sidebar always uses the project settings instead of the dialog settings
@reckart reckart closed this as completed Apr 24, 2024
reckart added a commit that referenced this issue Apr 24, 2024
@reckart
Merge branch 'release/32.x'
f14fb3b 
* release/32.x:
  #4762 - Re-merging via the curation sidebar always uses the project settings instead of the dialog settings
reckart added a commit that referenced this issue May 2, 2024
@reckart
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
e5bdb45 
* main: (110 commits)
  #4787 - When re-merging a document CASMetadata is not retained
  #4785 - Upgrade dependencies
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  #4768 - Bulk curation
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-32.1
  #4782 - Avoid duplicate key error when importing documents very rapidly
  #4780 - Optionally include example documents in project templates
  #4778 - Links and other active elements in PDFs interfere with annotation and should be disabled
  #4739 - Auto-merge on open document in curation mode
  #4774 - Ability to not reset curation when performing a manual merge (sidebar curation)
  #4772 - Repair to trim whitespace off annotations
  #4769 - Cannot export CAS RDF
  #4768 - Bulk curation
  #4766 - Add ID column to documents table in dev mode
  #4764 - No longer force-enable server-side timings when dev mode is disabled
  #4762 - Re-merging via the curation sidebar always uses the project settings instead of the dialog settings
  ...

% Conflicts:
%	inception/inception-dependencies/pom.xml
%	inception/inception-diam-editor/pom.xml
%	inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamAnnotationBrowser.java
%	inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java
%	inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java
%	inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java
%	inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java
%	inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java
%	inception/inception-ui-dashboard-activity/pom.xml
%	inception/inception-ui-kb/pom.xml
%	inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java
%	pom.xml
reckart added a commit that referenced this issue May 3, 2024
@reckart
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
d96c29f 
* main: (110 commits)
  #4787 - When re-merging a document CASMetadata is not retained
  #4785 - Upgrade dependencies
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  #4768 - Bulk curation
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-32.1
  #4782 - Avoid duplicate key error when importing documents very rapidly
  #4780 - Optionally include example documents in project templates
  #4778 - Links and other active elements in PDFs interfere with annotation and should be disabled
  #4739 - Auto-merge on open document in curation mode
  #4774 - Ability to not reset curation when performing a manual merge (sidebar curation)
  #4772 - Repair to trim whitespace off annotations
  #4769 - Cannot export CAS RDF
  #4768 - Bulk curation
  #4766 - Add ID column to documents table in dev mode
  #4764 - No longer force-enable server-side timings when dev mode is disabled
  #4762 - Re-merging via the curation sidebar always uses the project settings instead of the dialog settings
  ...

% Conflicts:
%	inception/inception-dependencies/pom.xml
%	inception/inception-diam-editor/pom.xml
%	inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamAnnotationBrowser.java
%	inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java
%	inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java
%	inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java
%	inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java
%	inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java
%	inception/inception-ui-dashboard-activity/pom.xml
%	inception/inception-ui-kb/pom.xml
%	inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java
%	pom.xml
reckart added a commit that referenced this issue May 3, 2024
@reckart
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
c85d4e4 
* main: (110 commits)
  #4787 - When re-merging a document CASMetadata is not retained
  #4785 - Upgrade dependencies
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  #4768 - Bulk curation
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0-beta-1
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-32.1
  #4782 - Avoid duplicate key error when importing documents very rapidly
  #4780 - Optionally include example documents in project templates
  #4778 - Links and other active elements in PDFs interfere with annotation and should be disabled
  #4739 - Auto-merge on open document in curation mode
  #4774 - Ability to not reset curation when performing a manual merge (sidebar curation)
  #4772 - Repair to trim whitespace off annotations
  #4769 - Cannot export CAS RDF
  #4768 - Bulk curation
  #4766 - Add ID column to documents table in dev mode
  #4764 - No longer force-enable server-side timings when dev mode is disabled
  #4762 - Re-merging via the curation sidebar always uses the project settings instead of the dialog settings
  ...

% Conflicts:
%	inception/inception-dependencies/pom.xml
%	inception/inception-diam-editor/pom.xml
%	inception/inception-diam-editor/src/main/java/de/tudarmstadt/ukp/inception/diam/sidebar/DiamAnnotationBrowser.java
%	inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/ExternalAnnotationEditorBase.java
%	inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java
%	inception/inception-search-core/src/main/java/de/tudarmstadt/ukp/inception/search/SearchServiceImpl.java
%	inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/config/InviteServiceAutoConfiguration.java
%	inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/AnnotationDetailEditorPanel.java
%	inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/config/CurationUIAutoConfiguration.java
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/inception/ui/curation/sidebar/config/CurationSidebarAutoConfiguration.java
%	inception/inception-ui-dashboard-activity/pom.xml
%	inception/inception-ui-kb/pom.xml
%	inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/annotation/DynamicWorkflowDocumentNavigationActionBarExtension.java
%	pom.xml
@reckart reckart added this to Kanban Aug 7, 2024
@reckart reckart moved this to 🍹 Done in Kanban Aug 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@reckart reckart

Labels
🐛Bug Something isn't working Module: Curation
Projects
Kanban
Archived in project
Milestone
32.1
Development

No branches or pull requests
1 participant
@reckart