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
Release candidate - v3.0.4 #3043
Merged
Merged
Conversation
This file contains 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
Merge 3.0.3 into deploy/dmponline
fix for rubocop updated db schema rubocop appeasement fixed issue with db schema eslinter fixes fix weird rspec error fixed issue with schema fixed issue with deserialization service
New maDMP additions for the project details page
change migration classname
return the standard html error page. Changes: In ApplicationController: - so that rescue_from errors are rendered appropriately formatted messages for html and json with a private method render_respond_to_format_with_error_message() - added a rescue_from StandardError with a method handle_server_method() - updated existing user_not_authorized - updated rescue_from ActiveRecord::RecordNotFound by removing if Production condition - added missing method render_not_found() In spec/controllers/super_admin/orgs_controller_spec.rb failing tests (1) merge_analyze: test "fails if user is not a super admin" (2) merge_commit: test "fails if user is not a super admin" - changed redirect_to(plans_path) -> redirect_to(root_path) - removed "format: :js" because of ActionController::UnknownFormatError post :merge_analyze, params: @params. format: :js and post :merge_commit, params: @params. format: :js
…urn_json_not_html_page Issue #561 - Fix for ensuring Json format rendering errors no longer
…password_page Bug 403 add recapcha to new password page
Db cleanup
Remove p tag from help page text changes
…ity_XSS_hack Remove vulnerability xss hack
opposite. Changes to following views in shared/export: - _plan.erb & _plan_txt.erb: In the questions code block added a missing check for whether the question should be displayed. This required moving some of the variables evaluated from lower down in the code, as we need them for our check here.
…into handle_pundit_errors
… fields except for fields: abbreviation code name firstname surname
…enabled-for-small-data-entry-boxes Issue #2169 - Added missing spellcheck for all form text and textarea…
Apologies to @johnpinto1 for editing his file but for a one line change I didn't think it was worth holding things up. I removed the first blank declaration since it wasn't used until after the second blank declaration. That seemed tidier to me.
…aswered_questions_bug Issue #2958 - Fix for Download option "unanswered questions" does
Translation sync 20211001
added handler for Pundit errors on ApplicationController
portagenetwork
pushed a commit
to portagenetwork/roadmap
that referenced
this pull request
Feb 24, 2022
Release candidate - v3.0.4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Release candidate for v3.0.4
Researchers
config/initializers/_dmproadmap.rb
)config/initializers/_dmproadmap.rb
)Admins
plan.owner
as the data contact if available (otherwise the contributor who is the :data_curator)ethical_issues
fieldsresearch_domain
as a :keywordplan.org
as a :dmproadmap_funded_affilaition to deal with scenarios where theplan.org
does not match the orgs defined for the owner or contributorsplan.identifier
as :dmproadmap_funding_opportunity_numberDevelopers
grant
getter and setter overrides to the Plan model to allow the grant to be loaded and set properly from incoming UI params.config/initializers/_dmproadmap.rb
orgs.is_other
andusers.other_organization
being listed on the ticket, they were not removed)utils/conditionalFields.js
file that can be used to hide/show form elements based on the state of a checkbox within a<conditional></conditional>
block.utils/conditionalFields.js
feedback_confirmation
mailerrails external_apis:add_field_of_science_to_research_domains
that populates the newresearch_domains
tableWarning! This update will drop the old
user_identifiers
andorg_identifiers
tables. You should evaluate the data in these tables to ensure that there are no recent record (the transition to the consolidatedidentifiers
table occurred several versions ago). It is advisable to backup your database prior to the upgrade.If you wish to enable the new Research Domain selection box and/or Ethical Issues questions on the 'Project Details' page, you will need to run
bin/rails external_apis:add_field_of_science_to_research_domains RAILS_ENV=[env]
and set theenable_research_domain
and/orenable_ethical_issues
flags in theconfig/initializers/_dmproadmap.rb
file (note that you will need to restart the Rails server after updating the config).