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

Fix Group hit counter calculation preferences #6554

Merged
merged 9 commits into from
Jun 2, 2020
Merged

Conversation

calixtus
Copy link
Member

@calixtus calixtus commented May 29, 2020

closes #6244
fixes #6042

Created this PR because I kinda messed up the git history in PR 6244.

  • Change in CHANGELOG.md described (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 documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

Gena928 and others added 9 commits April 5, 2020 18:35
Now it's responsible for count if items in group (enable / disable, based on user preferences)
In case we can't use PreferencesService injection, I propose to create a property (displayItemsCount) and set this property from outside (from GroupTreeView) as True/False. True - need get count, False - NO need to get count of items.
Also I found method "onDatabaseChanged" - it fires when you delete/add new items to group. So we need "displayItemsCount" to restrict calculation in this case also.

By default displayItemsCount = False
My method (calculateNumberOfMatches) is no longer valid and GroupNodeViewModel must use a new methods called "findMatches"
@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label May 30, 2020
@Siedlerchr Siedlerchr changed the title Fix Gena928 6042(2) Fix Group hit counter preferences May 30, 2020
@Siedlerchr Siedlerchr changed the title Fix Group hit counter preferences Fix Group hit counter calculation preferences May 30, 2020
@calixtus
Copy link
Member Author

calixtus commented Jun 2, 2020

After short videocall with @koppor, this should be safe to merge.

@calixtus calixtus merged commit 46fd96b into master Jun 2, 2020
@calixtus calixtus deleted the Gena928-6042(2) branch June 2, 2020 20:19
Siedlerchr added a commit that referenced this pull request Jun 6, 2020
* upstream/master: (110 commits)
  Fix DOI import in RIS Importer
  Rename bibtexkey (#6545)
  check if fields are empty
  fix comment checkstyle arght
  Fix XMP Exctrator not returning empty optional
  Fix Group hit counter calculation preferences (#6554)
  add changelog entry
  Make test concise
  Add test for getXmpMetadata with no description
  guidelines updated
  lint and hint for JEE
  Update eclipse setting
  Bump checkstyle from 8.32 to 8.33
  Bump classgraph from 4.8.78 to 4.8.80
  Add more menu items to library context menu (#6551)
  Squashed 'src/main/resources/csl-styles/' changes from 586e0b8..c5f14e2
  Correct return description in javadoc
  iterate to get all selected leaf nodes
  check if metadata has start and end tag
  Update RisImporterTest.java
  ...
koppor pushed a commit that referenced this pull request Jun 1, 2023
6b7fdff8cb Create journal-of-the-american-philosophical-association.csl (#6542)
9bae9efc55 Update german-council-of-economic-experts.csl (#6562)
256250be9c Update springer-vancouver-brackets.csl (#6546)
f422ca9c9a Update turabian-fullnote-bibliography.csl (#6540)
2833b5d5d5 Update mots.csl (#6556)
44758704b0 Update and rename harvard-the-university-of-melbourne.csl to dependen… (#6547)
08e65fc8e1 Update ieee-with-url.csl (#6514)
06e98f4387 Fix erroneous comma in ACL in-text citation (#6553)
72e16a19cd Update bibliothek-forschung-und-praxis.csl (#6527)
50bae82394 Create Food and Agriculture Organization of the United Nations (numeric) (#6544)
234a3c35d8 Update bern-university-of-applied-sciences-school-of-agricultural-for… (#6552)
3e9e2d6e93 Fix et al and name settings in universitat bern institut fur sozialanthropologie (#6554)
e8e06888fe Update harvard-university-of-the-west-of-england.csl (#6520)
dbbe5c1a95 Update united-states-international-trade-commission.csl (#6535)
b985431f03 Update american-society-for-horticultural-science.csl (#6543)
e1ff9f5546 Sort APA and derivatives on displayed date, not full date (#6545)
7302832d6d Localize original-work-published in APA (#6388)
77a61c0d82 Update united-states-international-trade-commission.csl (#6526)
541807a057 Update the-accounting-review.csl (#6521)
708626357a  Update united-states-international-trade-commission

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 6b7fdff8cb0fb45b342e8ac319634bf18168c73d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Proposed enhancement: Make item count in groups panel an optional feature that can be turned off
4 participants