Merge pull request #2632 from tchak/fix-dossier-link

Fix dossier link
2018-09-20 16:13:04 +02:00 · 2018-09-20 16:13:04 +02:00 · 49113e8112
commit 49113e8112
parent 591e6f25c3 905a715e16
2 changed files with 3 additions and 3 deletions
--- 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'
--- 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