Merge pull request #10811 from colinux/fix-stats-nav-bar
ETQ usager, pas d'erreur sur la page stats quand je viens de la page commencer (à cause de la navbar)
This commit is contained in:
commit
39ebaadf03
3 changed files with 13 additions and 3 deletions
|
@ -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.
|
||||
|
@ -28,6 +34,10 @@ module NavBarProfileConcern
|
|||
|
||||
controller_instance = controller_class.new
|
||||
controller_instance.try(:nav_bar_profile)
|
||||
rescue StandardError => e # we don't want broken logic in nav bar profile to fail the request
|
||||
Sentry.capture_exception(e)
|
||||
|
||||
nil
|
||||
end
|
||||
|
||||
# Fallback for shared controllers from user account
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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?
|
||||
|
|
Loading…
Reference in a new issue