diff --git a/CHANGELOG.md b/CHANGELOG.md index b5637083df..0d97e39bfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +- Feature for Org admins can show/hide the ethical_issues field on plans [#3555](https://github.com/DMPRoadmap/roadmap/pull/3555). + ## v5.0.2 - Bump Ruby to v3.1.4 and use `.ruby-version` in CI - [#3566](https://github.com/DMPRoadmap/roadmap/pull/3566) diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb index ed0e3f78df..256bf4c43b 100644 --- a/app/controllers/orgs_controller.rb +++ b/app/controllers/orgs_controller.rb @@ -222,6 +222,7 @@ def org_params .permit(:name, :abbreviation, :logo, :contact_email, :contact_name, :remove_logo, :managed, :feedback_enabled, :org_links, :funder, :institution, :organisation, + :add_ro_ethical_concerns, :feedback_msg, :org_id, :org_name, :org_crosswalk, :helpdesk_email, identifiers_attributes: %i[identifier_scheme_id value], diff --git a/app/models/org.rb b/app/models/org.rb index 6a6eac55d2..4b96bdf6af 100644 --- a/app/models/org.rb +++ b/app/models/org.rb @@ -25,6 +25,7 @@ # region_id :integer # managed :boolean default(false), not null # helpdesk_email :string +# add_ro_ethical_concerns :boolean default(true), not null # # Foreign Keys # diff --git a/app/views/orgs/_profile_form.html.erb b/app/views/orgs/_profile_form.html.erb index ade41ce1cf..abb6df5d7c 100644 --- a/app/views/orgs/_profile_form.html.erb +++ b/app/views/orgs/_profile_form.html.erb @@ -180,8 +180,35 @@ <% end %> -