Merge branch 'dev'

This commit is contained in:
simon lehericey 2018-04-25 11:22:00 +02:00
commit 8e905c40c6

View file

@ -35,8 +35,8 @@ module Flipflop::Strategies
end
def find_current_administrateur
if request.session["warden.user.user.key"]
administrateur_id = request.session["warden.user.user.key"][0][0]
if request.session["warden.user.administrateur.key"]
administrateur_id = request.session["warden.user.administrateur.key"][0][0]
Administrateur.find_by(id: administrateur_id)
end
end