diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index e887929de..fc82b26cb 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -34,8 +34,4 @@ module UserHelper def can_edit_org?(current_user) current_user.data_coordinator? || current_user.support? end - - def can_toggle_active?(user, current_user) - current_user != user && (current_user.support? || current_user.data_coordinator?) - end end diff --git a/app/views/users/_user_list.html.erb b/app/views/users/_user_list.html.erb index 7b9f0785d..780d481f0 100644 --- a/app/views/users/_user_list.html.erb +++ b/app/views/users/_user_list.html.erb @@ -49,7 +49,7 @@ <% end %> <% row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div")) %> <% row.cell(text: user.active? ? user.last_sign_in_at&.to_formatted_s(:govuk_date) : "Deactivated") %> - <% end %> + <% end %> <% end %> <% end %> <% end %> diff --git a/app/views/users/toggle-active.html.erb b/app/views/users/toggle-active.html.erb index 6265866cf..c2db46430 100644 --- a/app/views/users/toggle-active.html.erb +++ b/app/views/users/toggle-active.html.erb @@ -23,4 +23,4 @@ <% end %> - \ No newline at end of file + diff --git a/config/routes.rb b/config/routes.rb index ccf9f101e..4f11cf499 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,9 +35,6 @@ Rails.application.routes.draw do get "edit/password", to: "users#edit_password" end - resources :users do - end - get "/users/:id/deactivate", to: "users#deactivate" get "/users/:id/reactivate", to: "users#reactivate"