Issue #DCC649 - Fix for the contributor to fail to save on Contributor#3060
Merged
briri merged 1 commit intodevelopmentfrom Nov 3, 2021
Conversation
johnpinto1
force-pushed
the
bug_dcc_649-contributors_page_affiliation_not_set_prevents_save
branch
3 times, most recently
from
3bbb59a to
708e477
Compare
page if not required Affiliation field not set.
Changes:
- In ContributorsController an if condition has been changed in
process_org() method
Replaced 'return nil if org.blank? && !allow' by
'return hash if org.blank? && !allow' where 'hash remove_org_selection_params(params_in: hash)'
- RSpec test spec/controllers/contributors_controller_spec.rb method
'it "with restrict_orgs=true, returns nil if the org could not be
converted" do'
replaced by
'it "with restrict_orgs=true, returns hash if the org could not be
converted" do'
johnpinto1
force-pushed
the
bug_dcc_649-contributors_page_affiliation_not_set_prevents_save
branch
from
708e477 to
6f30ff1
Compare
briri
deleted the
bug_dcc_649-contributors_page_affiliation_not_set_prevents_save
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
page if not required Affiliation field not set.
Fix for DCC bug https://github.com/DigitalCurationCentre/DMPonline-Service/issues/649
Changes:
process_org() method
Replaced 'return nil if org.blank? && !allow' by
'return hash if org.blank? && !allow' where 'hash remove_org_selection_params(params_in: hash)'
'it "with restrict_orgs=true, returns nil if the org could not be
converted" do'
replaced by
'it "with restrict_orgs=true, returns hash if the org could not be
converted" do'
Based on @briri comment https://github.com/DigitalCurationCentre/DMPonline-Service/issues/649
I had to remove org from hash. Also combining the returns in process_org() defied my efforts so have
`
hash = remove_org_selection_params(params_in: hash)
`