diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index def9e66356..f1992845d4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -21,10 +21,10 @@ def admin_index @filter_admin = false @users = if current_user.can_super_admin? - User.includes(:department, :org, :perms, :roles, :identifiers).page(1) + User.includes(:department, :org, :perms, :roles, identifiers: :identifier_scheme).page(1) else current_user.org.users - .includes(:department, :org, :perms, :roles, :identifiers) + .includes(:department, :perms, :roles, identifiers: :identifier_scheme) .page(1) end end diff --git a/app/views/paginable/users/_index.html.erb b/app/views/paginable/users/_index.html.erb index 873619e128..3ae34dba24 100644 --- a/app/views/paginable/users/_index.html.erb +++ b/app/views/paginable/users/_index.html.erb @@ -93,8 +93,7 @@ <% end %> - <% presenter = IdentifierPresenter.new(identifiable: user) %> - <% presenter.identifiers.each do |identifier| %> + <% user.identifiers.each do |identifier| %>

<%= identifier.identifier_scheme.name %>

<% end %>