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.

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

updates #6

Merged
merged 10 commits into from
Oct 16, 2024
Merged

updates #6

merged 10 commits into from
Oct 16, 2024

Conversation

arfazhxss
Copy link
Owner

No description provided.

Siedlerchr and others added 10 commits October 16, 2024 05:03
* Add links to our setup guideline.

* Add link to PRs (to ensore that not koppors fork is used)

* Fix casing
* - Added a "Compare" button for duplicate entries in the CitationRelationsTab.
- Added localization key for 'Compare with duplicate entries'.

* - Implemented functionality to open a "Possible duplicate entries" for comparing and merging duplicate entries.
- Updated changelog for compare button feature.

* Updated changelog

* - Updated localization key for compare button tooltip.
- Fixed bug that when adding an entry to the library from Citation Relations Tab by adding the entry's clone instead of itself.
- Optimised openPossibleDuplicateEntriesWindow function in CitationRelationsTab.java to show result of undo and redo.
- Implemented that After clicking "merge", the current entry will be kept selected - and not the merged entry be selected.

* Modified CitationsRelationsTabViewModel and ImportHandler to pass CitationsRelationsTabViewModelTest with clone entries.

* - Deleted old code in CitationRelationTab.java which to implement that original entry be selected after citation item merge.
- Modified MainTable#clearAndSelect to ensure original entry be selected after citation item merge.
- Added some comments.

* Optimised citation relations item merge: Added a citation merge flag in MainTable.java to let original entry get selected after merge instead of selecting new merged entry.

* Optimised MainTable#clearAndSelect: make the code look more concise.

* Fixed bug: As original local entry of citation relation item has been changed to new merged entry, need to refresh selected citation relation item to ensure that the item link to current local entry instead of the old one.

* Adapted tool tip of compare button.

* - renamed some variables to make them more understandable
- fixed wrong position codes: codes that updating citation relation item and setting state of citationMergeMode now be moved into CitationRelationsTab#openPossibleDuplicateEntriesWindow
- modified some comments and Java doc

* Move statement closer to intended use

* Modified the column headings of the merge entries dialog to make them more self-explanatory.

---------

Co-authored-by: Oliver Kopp <[email protected]>
* Add references to other tests

* Simplify code

* Add test for extracting the first word

* Relax escaping

* Add link to PR

* Add tests

Refs #11367

* Refine CHANGELOG.md

* Refine CHANGELOG.md
@arfazhxss arfazhxss merged commit 1fbe626 into arfazhxss:main Oct 16, 2024
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants