From 7366b98412d6853bfd0f144556f1e2ccaf2097d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com> Date: Tue, 8 Feb 2022 17:21:26 +0100 Subject: [PATCH] fix --- app/controllers/admin/education/program/roles_controller.rb | 6 +++--- .../education/program/roles/_involvement_fields.html.erb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/education/program/roles_controller.rb b/app/controllers/admin/education/program/roles_controller.rb index 2d95bfaf5..dfa7e8fa6 100644 --- a/app/controllers/admin/education/program/roles_controller.rb +++ b/app/controllers/admin/education/program/roles_controller.rb @@ -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 diff --git a/app/views/admin/education/program/roles/_involvement_fields.html.erb b/app/views/admin/education/program/roles/_involvement_fields.html.erb index 505d7ca9b..0ce4a6118 100644 --- a/app/views/admin/education/program/roles/_involvement_fields.html.erb +++ b/app/views/admin/education/program/roles/_involvement_fields.html.erb @@ -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' %> -- GitLab