Skip to content
Snippets Groups Projects
Commit d74655e3 authored by Arnaud Levy's avatar Arnaud Levy
Browse files

Merge branch 'master' of github.com:noesya/osuny

parents 5056b608 7366b984
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@ class Admin::Education::Program::RolesController < Admin::Education::Program::Ap
include Admin::Reorderable
before_action :load_people, only: [:new, :edit, :create, :update]
before_action :load_administration_people, only: [:new, :edit, :create, :update]
def index
@roles = @roles.ordered
......@@ -69,7 +69,7 @@ class Admin::Education::Program::RolesController < Admin::Education::Program::Ap
University::Role
end
def load_people
@people = current_university.people.accessible_by(current_ability).ordered
def load_administration_people
@administration_people = current_university.people.administration.accessible_by(current_ability).ordered
end
end
......@@ -6,7 +6,7 @@
<i class="fa fa-bars handle"></i>
</div>
<div class="col-9">
<%= f.association :person, collection: @people, label: false, include_blank: :translate, wrapper: false, required: true %>
<%= f.association :person, collection: @administration_people, label: false, include_blank: :translate, wrapper: false, required: true %>
</div>
<div class="col-2">
<%= link_to_remove_association '<i class="fas fa-trash"></i>'.html_safe, f, class: 'btn btn-sm btn-danger' %>
......
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