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 for issue 6959 #7151

Merged
merged 7 commits into from
Dec 4, 2020
Merged

Conversation

luis-valdez
Copy link
Contributor

@luis-valdez luis-valdez commented Dec 3, 2020

Fixes #6959 implementing the method needsSharedDatabase in the ActionHelper and then binding it in the class PullChangesFromSharedDatabase. This solution prevents the user from clicking "Pull changes from database" if a shared database is not present.

When the DatabaseLocation is local:
Screen Shot 2020-12-02 at 5 13 49 PM

When the DatabaseLocation is shared:
Screen Shot 2020-12-02 at 5 19 30 PM

When there is no library open:
Screen Shot 2020-12-03 at 1 06 53 PM

  • 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.

@Siedlerchr
Copy link
Member

Please have a look at the failing checkstyle check.
Can you also please test the case when no library is open? e.g. all tabs closed?

Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

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

Thanks! Two minor remarks from my side, then this is good to go!

CHANGELOG.md Outdated Show resolved Hide resolved
src/main/java/org/jabref/gui/actions/ActionHelper.java Outdated Show resolved Hide resolved
Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

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

Thanks!

@luis-valdez
Copy link
Contributor Author

Thanks for letting me contribute, I'll pick up another issue

@Siedlerchr
Copy link
Member

If you could fix the remaining checkstyle errors it would be fine:

 Error: eckstyle] [ERROR] /home/runner/work/jabref/jabref/src/main/java/org/jabref/gui/actions/ActionHelper.java:9:1: Wrong order for 'javafx.beans.binding.Binding' import. [ImportOrder]

Error: eckstyle] [ERROR] /home/runner/work/jabref/jabref/src/main/java/org/jabref/gui/actions/ActionHelper.java:22:1: 'com.tobiasdiez.easybind.EasyBind' should be separated from previous imports. [ImportOrder]
> Task :checkstyleMain

@Siedlerchr Siedlerchr merged commit eb5c8ca into JabRef:master Dec 4, 2020
@Siedlerchr
Copy link
Member

Thanks again for your contribution!

Siedlerchr added a commit that referenced this pull request Dec 6, 2020
* upstream/master:
  Improve library loading UX (#7119)
  remove jython (#7157)
  Add missing authors
  Remove obsolete hint
  Fixed issue in PreviewView for number textfield (#7158)
  Fix for issue 6959 (#7151)
  Revert "remove jython (#7155)" (#7156)
  remove jython (#7155)
  Fix remembering password for sql db (#7154)
  Update to libre office 7.0.3 (#7150)
  Add IdBasedSearchFetcher to jstor (#7145)
  Squashed 'src/main/resources/csl-styles/' changes from 55200d0..a20406d
  Bump antlr4-runtime from 4.8-1 to 4.9 (#7136)
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.

Exception when "pulling changes" from local database
3 participants