From fa3ed429a193fc4b1fc1e316a1c81d438d82478f Mon Sep 17 00:00:00 2001 From: marlena-b Date: Fri, 13 Oct 2023 13:02:54 +0200 Subject: [PATCH] Implement CR remarks --- app/controllers/organizations/invitations_controller.rb | 2 +- app/views/organizations/invitations/_form.html.erb | 2 +- app/views/organizations/invitations/new.html.erb | 2 +- app/views/organizations/staff/index.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/organizations/invitations_controller.rb b/app/controllers/organizations/invitations_controller.rb index 254cfcb5d..c49959cee 100644 --- a/app/controllers/organizations/invitations_controller.rb +++ b/app/controllers/organizations/invitations_controller.rb @@ -14,7 +14,7 @@ def create if @user.save @user.staff_account.add_role(user_params[:staff_account_attributes][:roles]) @user.invite!(current_user) - redirect_to staff_index_path, notice: "Staff saved successfully." + redirect_to staff_index_path, notice: "Invite sent!" else render :new, status: :unprocessable_entity end diff --git a/app/views/organizations/invitations/_form.html.erb b/app/views/organizations/invitations/_form.html.erb index 9c215523a..3effd12fc 100644 --- a/app/views/organizations/invitations/_form.html.erb +++ b/app/views/organizations/invitations/_form.html.erb @@ -32,7 +32,7 @@
- <%= form.submit 'Save profile', class: 'btn btn-primary' %> + <%= form.submit 'Send invite', class: 'btn btn-primary' %>
diff --git a/app/views/organizations/invitations/new.html.erb b/app/views/organizations/invitations/new.html.erb index 74aa64b11..616ee3bda 100644 --- a/app/views/organizations/invitations/new.html.erb +++ b/app/views/organizations/invitations/new.html.erb @@ -1,7 +1,7 @@
- <%= provide(:header_title, "New staff") %> + <%= provide(:header_title, "Invite staff") %> <%= content_for :button do %> <%= link_to "Back to staff", staff_index_path, class: "btn btn-primary" %>
diff --git a/app/views/organizations/staff/index.html.erb b/app/views/organizations/staff/index.html.erb index 57d1cd4af..9e87695ee 100644 --- a/app/views/organizations/staff/index.html.erb +++ b/app/views/organizations/staff/index.html.erb @@ -3,7 +3,7 @@ <%= content_for :button do %> - <%= link_to "New Staff", new_user_invitation_path, class: "btn btn-primary" %>
+ <%= link_to "Invite Staff", new_user_invitation_path, class: "btn btn-primary" %>
<% end %>