diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e1b052a25..ed758ddbf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -90,8 +90,6 @@ class ApplicationController < ActionController::Base logged_users.first end - helper_method :logged_user - def logged_user_roles roles = logged_users.map { |logged_user| logged_user.class.name } roles.any? ? roles.join(', ') : 'Guest' diff --git a/app/views/shared/champs/dossier_link/_help_block.html.haml b/app/views/shared/champs/dossier_link/_help_block.html.haml index 624dc21c8..ebf725a29 100644 --- a/app/views/shared/champs/dossier_link/_help_block.html.haml +++ b/app/views/shared/champs/dossier_link/_help_block.html.haml @@ -1,5 +1,7 @@ - if id.present? - - dossier = logged_user.dossiers.find_by(id: id) + - dossier = current_user&.dossiers&.find_by(id: id) + - dossier ||= current_gestionnaire&.dossiers&.find_by(id: id) + - dossier ||= current_administrateur&.dossiers&.find_by(id: id) - if dossier.blank? %p.text-warning Ce dossier est inconnu