Commit 9df4d252 authored by Beat Seeliger's avatar Beat Seeliger

Merge branch 'Fixes/accepted_at-should-show-at-volunteer-selection' into 'develop'

Fixes/Accepted at should appear on volunteer selection list

See merge request !885
parents d3a51058 335e7fc5
Pipeline #32546 failed with stage
in 10 minutes and 28 seconds
......@@ -20,6 +20,7 @@
th.limit-width= select_all_rows
th Freiwilliger/r
th Einsatz
th= t_attr(:accepted_at, Volunteer)
tbody
= f.simple_fields_for :semester_process_volunteers, @spvs_sorted do |fv|
tr.table-row-selectable
......@@ -29,6 +30,7 @@
= fv.hidden_field :volunteer_id
- fv.object.semester_process_volunteer_missions.each do |mission|
= link_to mission.mission.to_label, mission.mission
td= l(fv.object.volunteer.accepted_at.to_date) if fv.object.volunteer.accepted_at
.row:.col-xs-12
= f.button :submit
......@@ -26,7 +26,6 @@
th= t_attr(:comments)
th= sort_link @q, :external
th= t_attr(:created_by, Volunteer)
th= t_attr(:accepted_at, Volunteer)
tbody
= render volunteers
......
......@@ -58,4 +58,3 @@ tr id=(dom_id(volunteer))
= link_to volunteer.registrar.full_name, profile_url_path(volunteer.registrar)
br
= l(volunteer.created_at.to_date) if volunteer.created_at
td = l(volunteer.accepted_at.to_date) if volunteer.accepted_at
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment