diff --git a/app/models/user.rb b/app/models/user.rb index 6ab66091be996263f2dad35fc5a0b96d198205c6..67d95f094d08eb617275ef0711c014da46060732 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -66,6 +66,7 @@ class User < ApplicationRecord scope :ordered, -> { order(:last_name, :first_name) } def to_s - "#{first_name} #{last_name}" + "#{last_name} #{first_name}" end + end diff --git a/app/views/admin/research/researchers/_form.html.erb b/app/views/admin/research/researchers/_form.html.erb index aea62c4a05857e79ca7be037c4ba7c065a01a6fd..aa0ad38d19d94731434ed2819a17f1b8a3c1759e 100644 --- a/app/views/admin/research/researchers/_form.html.erb +++ b/app/views/admin/research/researchers/_form.html.erb @@ -3,7 +3,7 @@ <div class="col-md-4"> <%= f.input :first_name %> <%= f.input :last_name %> - <%= f.association :user %> + <%= f.association :user, collection: current_university.users.ordered %> </div> <div class="col-md-8"> <%= f.input :biography, input_html: { rows: 5 } %>