diff --git a/CHANGELOG.md b/CHANGELOG.md index 55feb6cc3a..5416dfef57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - Bump mysql2 from 0.5.5 to 0.5.6 [#645](https://github.com/portagenetwork/roadmap/pull/645) +- Added "Accept terms and conditions" checkbox to invitation form [#684](https://github.com/portagenetwork/roadmap/pull/684) + ### Fixed - Updated Webmock's allowed request list to enable fetching of chromedriver [#670](https://github.com/portagenetwork/roadmap/pull/670) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7f27d0c357..578ee3da95 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -172,7 +172,7 @@ def from_external_domain? end def configure_permitted_parameters - devise_parameter_sanitizer.permit(:accept_invitation, keys: %i[firstname surname org_id]) + devise_parameter_sanitizer.permit(:accept_invitation, keys: %i[firstname surname org_id accept_terms]) end def render_not_found(exception) diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb index 586af8dff6..024d35b9b1 100644 --- a/app/views/devise/invitations/edit.html.erb +++ b/app/views/devise/invitations/edit.html.erb @@ -37,6 +37,15 @@ required: true } %> +