gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 6bf356223a into 9908f88570

Browse source
This commit is contained in:
Nemo 2018-07-05 17:33:27 +00:00 • committed by GitHub
commit 2c5bd9eec3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/helpers/application_helper.rb
View file

@ -118,10 +118,15 @@ module ApplicationHelper
safe_join(event.speakers.map{ |speaker| link_to speaker.name, admin_user_path(speaker) }, ',')
end
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 }
def speaker_selector_input(form, conference)
users = conference.participants.pluck(:id, :username).map do |user|
[user[0], user[1]]
end
users = users.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[1], user[0]]}, @event.speakers.map(&:id)),
include_blank: false, label: 'Speakers', input_html: { class: 'select-help-toggle', multiple: 'true' }
end

2
app/views/proposals/_proposal_form.html.haml
View file

@ -4,7 +4,7 @@
= f.input :subtitle, as: :string
= speaker_selector_input f
= speaker_selector_input f, @conference
= track_selector_input f