Skip to content

Place subgroups w.r.t. alphabetical ordering#9228

Merged
Siedlerchr merged 6 commits into
JabRef:mainfrom
0x002A:fix-koppor-577
Oct 12, 2022
Merged

Place subgroups w.r.t. alphabetical ordering#9228
Siedlerchr merged 6 commits into
JabRef:mainfrom
0x002A:fix-koppor-577

Conversation

@0x002A

@0x002A 0x002A commented Oct 9, 2022

Copy link
Copy Markdown
Member

Fixes JabRef#577

Additionally, resorting when changing the group name is implemented accordingly.

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

0x002A and others added 2 commits October 9, 2022 16:08
* upstream/main:
  Check group type before showing dialog in edit group (JabRef#8909)
  Fix unexpected closing of preferences dialog (JabRef#9225)
  Fix typo in connection error message (JabRef#9226)

# Conflicts:
#	src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java

@calixtus calixtus left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codewise looks good to me

@0x002A

0x002A commented Oct 10, 2022

Copy link
Copy Markdown
Member Author

I just fixed a reference in the changelog. Now it’s really ready for merge from my side

@calixtus calixtus requested a review from Siedlerchr October 12, 2022 18:26
@Siedlerchr Siedlerchr added status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers hacktoberfest-accepted labels Oct 12, 2022

@Siedlerchr Siedlerchr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks again!

@Siedlerchr Siedlerchr merged commit fe2ceef into JabRef:main Oct 12, 2022
Siedlerchr added a commit that referenced this pull request Oct 13, 2022
* upstream/main: (42 commits)
  Place subgroups w.r.t. alphabetical ordering (#9228)
  DOAB Fetcher now fetches ISBN and imprint fields where possible (#9229)
  ISSUE-9145: implement isbn fetcher (#9205)
  Remove explicit javafx jmod stuff (#9245)
  New Crowdin updates (#9239)
  Support Arabic language (#9243)
  Process CLI arguments before starting gui (#9217)
  Update README Decision Records link (#9241)
  Opening a file removes duplicate keywords and triggers lib changed (#9216)
  New Crowdin updates (#9237)
  Add Ukrainian as language (#9236)
  Add ADR-0026 on using Swing's FileChooser (#9235)
  Log exception (#9227)
  Fix archunit (#9234)
  Bump tika-core from 2.4.1 to 2.5.0 (#9232)
  Check group type before showing dialog in edit group (#8909)
  Fix unexpected closing of preferences dialog (#9225)
  Fix typo in connection error message (#9226)
  Improve VSCode config (#9218)
  Searching for an entry on the web shouldn't take forever (#9199)
  ...

# Conflicts:
#	build.gradle
#	lib/afterburner.fx.jar
#	src/main/java/org/jabref/cli/Launcher.java
#	src/main/java/org/jabref/gui/EntryTypeView.java
#	src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
#	src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
#	src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java
#	src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
#	src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
#	src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java
#	src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
#	src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
#	src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
#	src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
#	src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
#	src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
#	src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
#	src/main/java/org/jabref/gui/help/AboutDialogView.java
#	src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
#	src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
#	src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
#	src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
#	src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
#	src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
#	src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
#	src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
#	src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
#	src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
#	src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
#	src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
#	src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
#	src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
#	src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
#	src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
#	src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
#	src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
#	src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
#	src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
#	src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
#	src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
#	src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
#	src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
#	src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
Siedlerchr added a commit that referenced this pull request Oct 17, 2022
* upstream/main:
  Make autosave tick in shared database opening dialog active (#9258)
  Bump controlsfx from 11.1.1 to 11.1.2 (#9261)
  Bump actions/configure-pages from 1 to 2 (#9262)
  Bump hmarr/auto-approve-action from 2.4.0 to 3.0.0 (#9259)
  Bump gittools/actions from 0.9.13 to 0.9.14 (#9260)
  Fix for resizing cleanup entries dialog (#9240)
  Refresh example styles
  Squashed 'buildres/csl/csl-locales/' changes from cb98d36691..e243665390
  Squashed 'buildres/csl/csl-styles/' changes from 7bde3e4..4eee79a
  Fix casing
  Update contributing.md
  Remove obsolete Jekyll howto
  Updates Just-the-Docs from 0.3.3 to 0.4.0.rc3 (#9249)
  Place subgroups w.r.t. alphabetical ordering (#9228)
  DOAB Fetcher now fetches ISBN and imprint fields where possible (#9229)
  ISSUE-9145: implement isbn fetcher (#9205)
  Remove explicit javafx jmod stuff (#9245)
  New Crowdin updates (#9239)
Siedlerchr added a commit that referenced this pull request Oct 21, 2022
* upstream/main: (28 commits)
  Minor code improvements in library properties dialog (#9265)
  Adjust and make tests for BibTex/Biblatex/CSL mapping more accurate by adding Apa 7th edition (#9255)
  Removed swing from default file dir detection (#9222)
  Make autosave tick in shared database opening dialog active (#9258)
  Bump controlsfx from 11.1.1 to 11.1.2 (#9261)
  Bump actions/configure-pages from 1 to 2 (#9262)
  Bump hmarr/auto-approve-action from 2.4.0 to 3.0.0 (#9259)
  Bump gittools/actions from 0.9.13 to 0.9.14 (#9260)
  Fix for resizing cleanup entries dialog (#9240)
  Refresh example styles
  Squashed 'buildres/csl/csl-locales/' changes from cb98d36691..e243665390
  Squashed 'buildres/csl/csl-styles/' changes from 7bde3e4..4eee79a
  Fix casing
  Update contributing.md
  Remove obsolete Jekyll howto
  Updates Just-the-Docs from 0.3.3 to 0.4.0.rc3 (#9249)
  Place subgroups w.r.t. alphabetical ordering (#9228)
  DOAB Fetcher now fetches ISBN and imprint fields where possible (#9229)
  ISSUE-9145: implement isbn fetcher (#9205)
  Remove explicit javafx jmod stuff (#9245)
  ...
Siedlerchr added a commit to TheGor1lla/jabref that referenced this pull request Oct 21, 2022
* upstream/main:
  [WIP] Add GitHub action: Greetings.yml - Automates advice to JabRefs first time code contributors (JabRef#9272)
  Minor code improvements in library properties dialog (JabRef#9265)
  Adjust and make tests for BibTex/Biblatex/CSL mapping more accurate by adding Apa 7th edition (JabRef#9255)
  Removed swing from default file dir detection (JabRef#9222)
  Make autosave tick in shared database opening dialog active (JabRef#9258)
  Bump controlsfx from 11.1.1 to 11.1.2 (JabRef#9261)
  Bump actions/configure-pages from 1 to 2 (JabRef#9262)
  Bump hmarr/auto-approve-action from 2.4.0 to 3.0.0 (JabRef#9259)
  Bump gittools/actions from 0.9.13 to 0.9.14 (JabRef#9260)
  Fix for resizing cleanup entries dialog (JabRef#9240)
  Refresh example styles
  Squashed 'buildres/csl/csl-locales/' changes from cb98d36691..e243665390
  Squashed 'buildres/csl/csl-styles/' changes from 7bde3e4..4eee79a
  Fix casing
  Update contributing.md
  Remove obsolete Jekyll howto
  Updates Just-the-Docs from 0.3.3 to 0.4.0.rc3 (JabRef#9249)
  Place subgroups w.r.t. alphabetical ordering (JabRef#9228)
  DOAB Fetcher now fetches ISBN and imprint fields where possible (JabRef#9229)
@koppor

koppor commented Jul 11, 2023

Copy link
Copy Markdown
Member

Does this PR check the condition "In case the group sub tree is sorted alphabetically"? I did not see it in the code.

@koppor koppor deleted the fix-koppor-577 branch July 11, 2023 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component: groups status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

When a new sub group is created, it should be sorted-in alphabetically

5 participants