diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f0311c7a..9ef09e55 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -126,17 +126,17 @@ module ApplicationHelper safe_join(event.speakers.map{ |speaker| link_to speaker.name, admin_user_path(speaker) }, ',') end - def speaker_selector_input(form) +def speaker_selector_input(form) users = User.active.pluck(:id, :name, :username, :email).map { |user| [user[0], user[1].blank? ? user[2] : user[1], user[2], user[3]] }.sort_by { |user| user[1].downcase } form.input :speakers, as: :select, - collection: options_for_select(users.map {|user| ["#{user[1]} (#{user[2]}) #{user[3]}", user[0]]}, @event.speakers.map(&:id)), + collection: options_for_select(users.map {|user| ["#{user[2]} #{user[3]}", user[0]]}, @event.speakers.map(&:id)), include_blank: false, label: 'Speakers', input_html: { class: 'select-help-toggle', multiple: 'true' } end def responsibles_selector_input(form) users = User.active.pluck(:id, :name, :username, :email).map { |user| [user[0], user[1].blank? ? user[2] : user[1], user[2], user[3]] }.sort_by { |user| user[1].downcase } form.input :responsibles, as: :select, - collection: options_for_select(users.map {|user| ["#{user[1]} (#{user[2]}) #{user[3]}", user[0]]}, @booth.responsibles.map(&:id)), + collection: options_for_select(users.map {|user| ["#{user[2]} #{user[3]}", user[0]]}, @booth.responsibles.map(&:id)), include_blank: false, label: 'Responsibles', input_html: { class: 'select-help-toggle', multiple: 'true' }, hint: 'The people responsible for the booth. You can only select existing users.' end