Browse Source

CLDC-2328: Flash now shows email address, Button moved.

pull/1680/head
Aaron Spencer 3 years ago
parent
commit
acb4b09fec
  1. 2
      app/controllers/users_controller.rb
  2. 4
      app/views/users/show.html.erb
  3. 2
      spec/features/user_spec.rb

2
app/controllers/users_controller.rb

@ -31,7 +31,7 @@ class UsersController < ApplicationController
def resend_invite def resend_invite
@user.send_confirmation_instructions @user.send_confirmation_instructions
flash[:notice] = "Invitation sent" flash[:notice] = "Invitation sent to #{@user.email}"
render :show render :show
end end

4
app/views/users/show.html.erb

@ -96,10 +96,10 @@
<div class="govuk-button-group"> <div class="govuk-button-group">
<% if current_user.can_toggle_active?(@user) %> <% if current_user.can_toggle_active?(@user) %>
<% if @user.active? %> <% if @user.active? %>
<%= govuk_button_link_to "Deactivate user", deactivate_user_path(@user), warning: true %>
<% if current_user.support? %> <% if current_user.support? %>
<%= govuk_button_to "Resend invite link", resend_invite_user_path(@user) %> <%= govuk_button_to "Resend invite link", resend_invite_user_path(@user), secondary: true %>
<% end %> <% end %>
<%= govuk_button_link_to "Deactivate user", deactivate_user_path(@user), warning: true %>
<% else %> <% else %>
<span class="app-!-colour-muted govuk-!-margin-right-2"> <span class="app-!-colour-muted govuk-!-margin-right-2">
This user has been deactivated. <%= govuk_button_link_to "Reactivate user", reactivate_user_path(@user) %> This user has been deactivated. <%= govuk_button_link_to "Reactivate user", reactivate_user_path(@user) %>

2
spec/features/user_spec.rb

@ -452,7 +452,6 @@ RSpec.describe "User Features" do
expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success")
end end
end end
end end
context "when signed in as support" do context "when signed in as support" do
@ -730,6 +729,5 @@ RSpec.describe "User Features" do
end end
end end
end end
end end
end end

Loading…
Cancel
Save