DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Fix dossier link
This commit is contained in:
gregoirenovel 2018-09-20 16:13:04 +02:00 • committed by GitHub
commit 49113e8112
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -90,8 +90,6 @@ class ApplicationController < ActionController::Base
logged_users.first logged_users.first
end end
helper_method :logged_user
def logged_user_roles def logged_user_roles
roles = logged_users.map { |logged_user| logged_user.class.name } roles = logged_users.map { |logged_user| logged_user.class.name }
roles.any? ? roles.join(', ') : 'Guest' roles.any? ? roles.join(', ') : 'Guest'

4
app/views/shared/champs/dossier_link/_help_block.html.haml
View file

@ -1,5 +1,7 @@
- if id.present? - 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? - if dossier.blank?
%p.text-warning %p.text-warning
Ce dossier est inconnu Ce dossier est inconnu