Skip to content
Snippets Groups Projects
Unverified Commit 3e748e6f authored by Sébastien Gaya's avatar Sébastien Gaya
Browse files

sort_by in fields_for because sql order breaks temporary objects

parent 5902309e
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,7 @@ class Admin::Education::Program::Role::PeopleController < Admin::Education::Prog
def breadcrumb
super
add_breadcrumb Education::Program::Role.model_name.human(count: 2)
add_breadcrumb University::Role.model_name.human(count: 2)
add_breadcrumb(@role, admin_education_program_role_path(@role, { program_id: @program.id }))
if @involvement
@involvement.persisted? ? add_breadcrumb(@involvement, admin_education_program_role_person_path(@involvement, { program_id: @program.id, role_id: @role.id }))
......
......@@ -24,7 +24,7 @@
} %>
<div class="mb-3" id="involvements" data-sortable="inputs">
<%= f.simple_fields_for :involvements, role.involvements.ordered, include_id: false do |involvement_f| %>
<%= f.simple_fields_for :involvements, role.involvements.sort_by(&:position), include_id: false do |involvement_f| %>
<%= render 'admin/education/program/roles/involvement_fields', f: involvement_f, include_id: true %>
<% end %>
</div>
......
......@@ -78,7 +78,12 @@
} %>
<div class="row mb-3" id="involvements">
<%= f.simple_fields_for :university_person_involvements, program.university_person_involvements.ordered_by_name, include_id: false do |involvement_f| %>
<%
sorted_involvements = program.university_person_involvements.sort_by { |involvement|
[involvement.person&.last_name, involvement.person&.first_name]
}
%>
<%= f.simple_fields_for :university_person_involvements, sorted_involvements, include_id: false do |involvement_f| %>
<%= render 'admin/education/programs/involvement_fields', f: involvement_f, include_id: true %>
<% end %>
</div>
......
......@@ -25,7 +25,7 @@
} %>
<div class="mb-3" id="involvements" data-sortable="inputs">
<%= f.simple_fields_for :involvements, role.involvements.ordered, include_id: false do |involvement_f| %>
<%= f.simple_fields_for :involvements, role.involvements.sort_by(&:position), include_id: false do |involvement_f| %>
<%= render 'admin/education/school/roles/involvement_fields', f: involvement_f, include_id: true %>
<% end %>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment