diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index d8e9c1c9..41feb8b1 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -180,7 +180,7 @@ module Admin :track_id, :state, :language, :is_highlight, :max_attendees, # Not used anymore? :proposal_additional_speakers, :user, :users_attributes, - speaker_ids: []) + speaker_ids: [], volunteer_ids: []) end def comment_params diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9115b51e..96c2f8b1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -126,7 +126,7 @@ module ApplicationHelper def volunteer_links(event) safe_join(event.volunteers.map do |volunteer| link_to(volunteer.name, admin_user_path(volunteer)) - end, ',') + end, ', ') end def volunteer_selector_input(form) diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml index 999313b7..722387ac 100644 --- a/app/views/admin/events/_proposal.html.haml +++ b/app/views/admin/events/_proposal.html.haml @@ -85,6 +85,11 @@ ( = link_to speaker.email, "mailto: #{speaker.email}" ) + %tr + %td + %b Volunteers + %td + = volunteer_links(@event) %tr %td %b Biographies