From 01a91fb35b7c3322e4e74bcb970c17abd827aaf6 Mon Sep 17 00:00:00 2001 From: kara Diaby Date: Fri, 16 Apr 2021 11:11:39 +0200 Subject: [PATCH] modify controllers --- app/controllers/instructeurs/dossiers_controller.rb | 2 +- .../new_administrateur/procedures_controller.rb | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/instructeurs/dossiers_controller.rb b/app/controllers/instructeurs/dossiers_controller.rb index 2f414f292..785382649 100644 --- a/app/controllers/instructeurs/dossiers_controller.rb +++ b/app/controllers/instructeurs/dossiers_controller.rb @@ -60,7 +60,7 @@ module Instructeurs def avis @avis_seen_at = current_instructeur.follows.find_by(dossier: dossier)&.avis_seen_at @avis = Avis.new - if @dossier.procedure.feature_enabled?(:admin_affect_experts_to_avis) + if @dossier.procedure.experts_require_administrateur_invitation? @experts_emails = dossier.procedure.experts_procedures.where(revoked_at: nil).map(&:expert).map(&:email).sort end end diff --git a/app/controllers/new_administrateur/procedures_controller.rb b/app/controllers/new_administrateur/procedures_controller.rb index 4211fdcd7..bb32589d1 100644 --- a/app/controllers/new_administrateur/procedures_controller.rb +++ b/app/controllers/new_administrateur/procedures_controller.rb @@ -1,6 +1,6 @@ module NewAdministrateur class ProceduresController < AdministrateurController - before_action :retrieve_procedure, only: [:champs, :annotations, :edit, :monavis, :update_monavis, :jeton, :update_jeton, :publication, :publish, :transfert, :allow_expert_review] + before_action :retrieve_procedure, only: [:champs, :annotations, :edit, :monavis, :update_monavis, :jeton, :update_jeton, :publication, :publish, :transfert, :allow_expert_review, :experts_require_administrateur_invitation] before_action :procedure_locked?, only: [:champs, :annotations] ITEMS_PER_PAGE = 25 @@ -169,7 +169,7 @@ module NewAdministrateur def allow_expert_review @procedure.update!(allow_expert_review: !@procedure.allow_expert_review) flash.notice = @procedure.allow_expert_review? ? "Avis externes activés" : "Avis externes désactivés" - redirect_to admin_procedure_path(@procedure) + redirect_to admin_procedure_experts_path(@procedure) end def transfer @@ -185,6 +185,12 @@ module NewAdministrateur end end + def experts_require_administrateur_invitation + @procedure.update!(experts_require_administrateur_invitation: !@procedure.experts_require_administrateur_invitation) + flash.notice = @procedure.experts_require_administrateur_invitation? ? "Les experts sont gérés par les administrateurs de la démarche" : "Les experts sont gérés par les instructeurs" + redirect_to admin_procedure_experts_path(@procedure) + end + private def apercu_tab