Add notification when adding previous entries to new group configuration#8919
Merged
Conversation
… dialog and append additional information for WordKeywordGroup
Member
|
Looking good! Only one tiny nitpick:
I think this non-coherent behavour does not justify preventing a merger though. Ready for review and merge if you ask me :-) 👍 |
Member
|
Please have a look at the failing l10n tests, otherwise looks good to me already |
* upstream/main: Fix for Dark theme not readable (JabRef#8929) Find Unlinked files should ignore Thumbs.db, etc (JabRef#8800) Try to make reproducible builds (JabRef#8925) Link to new board (and refine text) Pass the data as a string (JabRef#8923) Add IntelliJ plugins to Gitpod configuration Add gradle support Fix extension name Remove obsolete closing bracket Add gitpod config (JabRef#8921) Fix javafx version not displayed in About Dialog (JabRef#8918) Redesign "Manage field names & content" dialog (JabRef#8892)
add changelog improve buttons
Member
|
I was to free to fix the l10n tests and to make the buttons more explicit.
|
Member
|
I tested this pr. Looking good 👍 JabRef 100.0.0 |
Contributor
Author
|
Thank you @ThiloteE and @Siedlerchr for helping this PR out! |
Siedlerchr
approved these changes
Jul 3, 2022
1 task
koppor
approved these changes
Jul 3, 2022
koppor
left a comment
Member
There was a problem hiding this comment.
OK for me to move on here.
This is nevertheless "tough" business logic happenning here, which should be tested automatically. To track that, I opened JabRef#584.
Siedlerchr
added a commit
to LIM0000/jabref
that referenced
this pull request
Jul 9, 2022
* upstream/main: Disable ResearchGateTest on CI (JabRef#8955) Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950) Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950) Bump mariadb-java-client from 2.7.5 to 2.7.6 (JabRef#8953) Add notification when adding previous entries to new group configuration (JabRef#8919) Remember Sidepane width after restart (JabRef#8936) move "Warn about duplicates on import" preferences option (JabRef#8937) Fix theme switching exception (JabRef#8939) fix merge conflict Squashed 'buildres/csl/csl-locales/' changes from 969d9567ac..55459cd79f Squashed 'buildres/csl/csl-styles/' changes from e740261..3d3573c Show pdf icon for mime type in maintable (JabRef#8935) Fix for Dark theme not readable (JabRef#8929) Find Unlinked files should ignore Thumbs.db, etc (JabRef#8800) Try to make reproducible builds (JabRef#8925) Link to new board (and refine text)
Siedlerchr
added a commit
that referenced
this pull request
Jul 10, 2022
* upstream/main: Bump checkstyle from 10.1 to 10.3.1 (#8950) Bump mariadb-java-client from 2.7.5 to 2.7.6 (#8953) Add notification when adding previous entries to new group configuration (#8919) Remember Sidepane width after restart (#8936) move "Warn about duplicates on import" preferences option (#8937) Fix theme switching exception (#8939)
Siedlerchr
added a commit
that referenced
this pull request
Jul 14, 2022
…failure-dialog * upstream/main: (76 commits) New Crowdin updates (#8972) New Crowdin updates (#8969) Fix .bat errorlevel handling with pwsh.exe check (#8965) revert jsoup version upgrade Fix charset detection with utf16 and others (#8947) Bump classgraph from 4.8.147 to 4.8.149 (#8968) Bump jsoup from 1.15.1 to 1.15.2 (#8967) Keep UTF-8 encoding header if present (#8964) Cleanup index when opening a library (#8962) Refactor context menu entry types changing (#8957) Improvement on check for missing commas when importing or opening a .bib file (#8840) Disable ResearchGateTest on CI (#8955) Bump checkstyle from 10.1 to 10.3.1 (#8950) Bump checkstyle from 10.1 to 10.3.1 (#8950) Bump mariadb-java-client from 2.7.5 to 2.7.6 (#8953) Add notification when adding previous entries to new group configuration (#8919) Remember Sidepane width after restart (#8936) move "Warn about duplicates on import" preferences option (#8937) Fix theme switching exception (#8939) fix merge conflict ... # Conflicts: # src/main/resources/l10n/JabRef_en.properties
Siedlerchr
added a commit
to LIM0000/jabref
that referenced
this pull request
Jul 15, 2022
* upstream/main: (28 commits) [Bot] Update CSL styles (JabRef#8978) New Crowdin updates (JabRef#8972) New Crowdin updates (JabRef#8969) Fix .bat errorlevel handling with pwsh.exe check (JabRef#8965) revert jsoup version upgrade Fix charset detection with utf16 and others (JabRef#8947) Bump classgraph from 4.8.147 to 4.8.149 (JabRef#8968) Bump jsoup from 1.15.1 to 1.15.2 (JabRef#8967) Keep UTF-8 encoding header if present (JabRef#8964) Cleanup index when opening a library (JabRef#8962) Refactor context menu entry types changing (JabRef#8957) Improvement on check for missing commas when importing or opening a .bib file (JabRef#8840) Disable ResearchGateTest on CI (JabRef#8955) Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950) Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950) Bump mariadb-java-client from 2.7.5 to 2.7.6 (JabRef#8953) Add notification when adding previous entries to new group configuration (JabRef#8919) Remember Sidepane width after restart (JabRef#8936) move "Warn about duplicates on import" preferences option (JabRef#8937) Fix theme switching exception (JabRef#8939) ... # Conflicts: # src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #8911
Previous discussion about add notification or documentation for adding original entries to new group configuration unexpectedly modifies original entries #8911
Proposed solution
Change from
showConfirmationDialogAndWaittoshowCustomButtonDialogAndWait. ThisshowCustomButtonDialogAndWaitwith warning alert allow user to select:Yesbutton, proceed to add previous entries into new groupNobutton, proceed to remove previous entries from new groupCancelbutton, cancel the group editing processCollect byis selected to beSearching for a keyword, warning dialog will display extra information of(Note: If original entries lack keywords to qualify for the new group configuration, confirming here will add them)forWordKeywordGroup. Please refer to keyword append discussion for more details.PR checklist:
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)