diff --git a/app/views/users/_user_list.html.erb b/app/views/users/_user_list.html.erb index fd854b53b..dccf83c2a 100644 --- a/app/views/users/_user_list.html.erb +++ b/app/views/users/_user_list.html.erb @@ -50,7 +50,7 @@ <% end %> <% end %> <% row.with_cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div")) %> - <% row.with_cell(text: user.active? ? user.last_sign_in_at&.to_formatted_s(:govuk_date) : "Deactivated") %> + <% row.with_cell(text: user.active? ? user.last_sign_in_at&.to_formatted_s(:govuk_date) : status_tag(:deactivated)) %> <%= govuk_link_to users_path(user) do %> User <%= user.id %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 895a2fe79..ce2b6ee71 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -112,6 +112,12 @@ row.with_action end end %> + + <%= summary_list.with_row do |row| + row.with_key { "Status" } + row.with_value { status_tag(@user.active? ? :active : :deactivated) } + row.with_action + end %> <% end %>