diff --git a/app/models/user_name_change_request.rb b/app/models/user_name_change_request.rb index 8db511e03..e80adcc82 100644 --- a/app/models/user_name_change_request.rb +++ b/app/models/user_name_change_request.rb @@ -9,7 +9,7 @@ class UserNameChangeRequest < ApplicationRecord after_create :update_name! def self.visible(user) - if user.is_admin? + if user.is_moderator? all elsif user.is_member? where(user: User.undeleted) diff --git a/app/policies/user_name_change_request_policy.rb b/app/policies/user_name_change_request_policy.rb index a7f38a9cf..53d223578 100644 --- a/app/policies/user_name_change_request_policy.rb +++ b/app/policies/user_name_change_request_policy.rb @@ -4,7 +4,7 @@ class UserNameChangeRequestPolicy < ApplicationPolicy end def show? - user.is_admin? || (user.is_member? && !record.user.is_deleted?) || (record.user == user) + user.is_moderator? || (user.is_member? && !record.user.is_deleted?) || (record.user == user) end def permitted_attributes diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb index 02101ceba..650aa5287 100644 --- a/app/presenters/user_presenter.rb +++ b/app/presenters/user_presenter.rb @@ -146,10 +146,4 @@ class UserPresenter [] end end - - def previous_names(template) - user.user_name_change_requests.visible(CurrentUser.user).map do |req| - template.link_to req.original_name, req - end.join(", ").html_safe - end end diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb index 563e5a57c..272d5ec4e 100644 --- a/app/views/users/_statistics.html.erb +++ b/app/views/users/_statistics.html.erb @@ -191,11 +191,19 @@