diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb index 985099900..2c3775488 100644 --- a/app/controllers/users/registrations_controller.rb +++ b/app/controllers/users/registrations_controller.rb @@ -1,4 +1,11 @@ class Users::RegistrationsController < Devise::RegistrationsController + skip_before_action :require_no_authentication + + def new + self.resource = resource_class.new + respond_with resource + end + protected def after_update_path_for(_resource) diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index ec331e9df..3106bd105 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,23 +1,28 @@ -

Sign up

+<% content_for :before_content do %> + <%= govuk_back_link( + text: 'Back', + href: :back, + ) %> +<% end %> -<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= render "devise/shared/error_messages", resource: resource %> +<%= form_for(resource, as: resource_name, url: user_registration_path(), html: { method: :patch }) do |f| %> +
+
+ <%= f.govuk_error_summary %> - <%= f.govuk_email_field :email, - label: { text: "Email address" }, - autocomplete: "email" - %> +

Invite user to submit CORE data

- <%= f.govuk_password_field :password, - hint: @minimum_password_length ? { text: "#{@minimum_password_length} characters minimum" } : nil, - autocomplete: "new-password" - %> + <%= f.govuk_text_field :name, + autocomplete: "name" + %> - <%= f.govuk_password_field :password_confirmation, - autocomplete: "new-password" - %> + <%= f.govuk_email_field :email, + label: { text: "Email address" }, + autocomplete: "email", + value: resource.email + %> - <%= f.govuk_submit "Sign up" %> + <%= f.govuk_submit "Continue" %> +
+
<% end %> - -<%= render "devise/shared/links" %> diff --git a/app/views/organisations/users.html.erb b/app/views/organisations/users.html.erb index 2c7ccc326..d46b1ea32 100644 --- a/app/views/organisations/users.html.erb +++ b/app/views/organisations/users.html.erb @@ -2,7 +2,7 @@ <%= "Users" %> <% end %> -<%= govuk_button_link_to "Invite user", new_user_registration_path, method: :post %> +<%= govuk_button_link_to "Invite user", new_user_registration_path, html: { "data-turbo" => "false" , method: :get } %> <%= govuk_table do |table| %> <%= table.head do |head| %> <%= head.row do |row|