Skip to content

Fix properly resolves OrFields of required fields#5903

Merged
tobiasdiez merged 4 commits into
JabRef:masterfrom
systemoperator:fix-required-fields-entry-editor
Feb 2, 2020
Merged

Fix properly resolves OrFields of required fields#5903
tobiasdiez merged 4 commits into
JabRef:masterfrom
systemoperator:fix-required-fields-entry-editor

Conversation

@systemoperator

@systemoperator systemoperator commented Feb 1, 2020

Copy link
Copy Markdown
Contributor

Addresses: #5859 and partially #5853

This fix adds all entries of OrFields of the required fields of EntryTypeDefinitions to the list of required fields for the tab "Required fields" of the entry editor.

  • Change in CHANGELOG.md described (if applicable)
  • Manually tested changed features in running JabRef (always required)

@systemoperator systemoperator changed the title Fix properly resolves OrFileds of required fields properly Fix properly resolves OrFields of required fields properly Feb 1, 2020
@systemoperator systemoperator changed the title Fix properly resolves OrFields of required fields properly Fix resolves OrFields of required fields properly Feb 1, 2020
@systemoperator systemoperator changed the title Fix resolves OrFields of required fields properly Fix properly resolves OrFields of required fields Feb 1, 2020

@tobiasdiez tobiasdiez 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.

LGTM!

@Siedlerchr

Copy link
Copy Markdown
Member

Please resolve the conflicts and fix the checkstyle issue than we can merge

@systemoperator

Copy link
Copy Markdown
Contributor Author

@Siedlerchr Is there still something I need to do? Which checkstyle issue do you mean?

@tobiasdiez

Copy link
Copy Markdown
Member

See https://github.com/JabRef/jabref/pull/5903/checks?check_run_id=422021255
I've fixed it for you and will merge now. Thanks again for another great PR!

@tobiasdiez tobiasdiez merged commit 06f2c18 into JabRef:master Feb 2, 2020
Siedlerchr added a commit that referenced this pull request Feb 3, 2020
* upstream/master:
  reference to issue added (#5911)
  Fix properly resolves OrFields of required fields (#5903)
  IDE setup updated and extended (#5901)
  Squashed 'src/main/resources/csl-styles/' changes from e71363e..c531528
  Fixes problems with managing external file types (issue 5846) (#5894)
  Squashed 'src/main/resources/csl-locales/' changes from 41da445acc..4fa753374e
  Squashed 'src/main/resources/csl-styles/' changes from f0c7374..e71363e
  Update development-strategy.md
Siedlerchr added a commit that referenced this pull request Feb 3, 2020
* master:
  reference to issue added (#5911)
  Fix properly resolves OrFields of required fields (#5903)
  IDE setup updated and extended (#5901)
  Squashed 'src/main/resources/csl-styles/' changes from e71363e..c531528
  Fixes problems with managing external file types (issue 5846) (#5894)
  Squashed 'src/main/resources/csl-locales/' changes from 41da445acc..4fa753374e
  Squashed 'src/main/resources/csl-styles/' changes from f0c7374..e71363e
  Update development-strategy.md
  Replace link to Workspace set-up with new one (#5896)
  Fixes making paths of linked files relative (web urls will not be touched anymore) (#5879)
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.

3 participants