From d4790f82770a12390faeb5a04b9731635bfa754b Mon Sep 17 00:00:00 2001 From: Xavier J Date: Mon, 19 Dec 2016 16:54:41 +0100 Subject: [PATCH] Fix root controller bugs --- app/controllers/root_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index fccfc2f2d..363ccefae 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -4,9 +4,11 @@ class RootController < ApplicationController if user_signed_in? && !route[:controller].match('users').nil? return redirect_to users_dossiers_path - end - if gestionnaire_signed_in? + elsif administrateur_signed_in? && !route[:controller].match('admin').nil? + return redirect_to admin_procedures_path + + elsif gestionnaire_signed_in? procedure_id = current_gestionnaire.procedure_filter if procedure_id.nil? procedure_list = current_gestionnaire.procedures @@ -16,7 +18,10 @@ class RootController < ApplicationController else flash.alert = "Vous n'avez aucune procédure d'affectée" end + else + return redirect_to backoffice_dossiers_procedure_path(id: procedure_id) end + elsif user_signed_in? return redirect_to users_dossiers_path @@ -25,7 +30,6 @@ class RootController < ApplicationController elsif administration_signed_in? return redirect_to administrations_path - end # @latest_release = Github::Releases.latest