From b68b340d81a646c13ab30972b4b2167c19f930e0 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Tue, 17 Sep 2024 15:59:24 +0200 Subject: [PATCH] fix(stats): nav bar profile logic when fallbacking on referer context without request --- app/controllers/concerns/nav_bar_profile_concern.rb | 6 ++++++ app/controllers/users/commencer_controller.rb | 4 +--- app/controllers/users/statistiques_controller.rb | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/nav_bar_profile_concern.rb b/app/controllers/concerns/nav_bar_profile_concern.rb index 4c856480f..96f4228b8 100644 --- a/app/controllers/concerns/nav_bar_profile_concern.rb +++ b/app/controllers/concerns/nav_bar_profile_concern.rb @@ -16,6 +16,12 @@ module NavBarProfileConcern private + def nav_bar_user_or_guest + # when instanciating manually the controller (see below), + # we don't have request and current_user would fail + request && current_user ? :user : :guest + end + # Shared controllers (search, errors, release notes…) don't have specific context # Simple attempt to try to re-use the profile from the previous page # so user does'not feel lost. diff --git a/app/controllers/users/commencer_controller.rb b/app/controllers/users/commencer_controller.rb index 76fbcf93e..7ab8c4c99 100644 --- a/app/controllers/users/commencer_controller.rb +++ b/app/controllers/users/commencer_controller.rb @@ -87,9 +87,7 @@ module Users retrieve_procedure end - def nav_bar_profile - current_user ? :user : :guest - end + def nav_bar_profile = nav_bar_user_or_guest def closing_details @procedure = Procedure.find_by(path: params[:path]) diff --git a/app/controllers/users/statistiques_controller.rb b/app/controllers/users/statistiques_controller.rb index acd6b9079..aa5019fe0 100644 --- a/app/controllers/users/statistiques_controller.rb +++ b/app/controllers/users/statistiques_controller.rb @@ -2,6 +2,8 @@ module Users class StatistiquesController < ApplicationController + def nav_bar_profile = nav_bar_user_or_guest + def statistiques @procedure = procedure return procedure_not_found if @procedure.blank? || @procedure.brouillon?