Merge pull request #1432 from betagouv/fix-1413

Usager header

app/controllers/new_gestionnaire/gestionnaire_controller.rb

@@ -3,5 +3,9 @@ module NewGestionnaire
     layout "new_application"
 
     before_action :authenticate_gestionnaire!
+
+    def nav_bar_profile
+      :gestionnaire
+    end
   end
 end

app/controllers/new_user/user_controller.rb

@@ -3,5 +3,9 @@ module NewUser
     layout "new_application"
 
     before_action :authenticate_user!
+
+    def nav_bar_profile
+      :user
+    end
   end
 end

app/views/layouts/_new_header.haml

@@ -1,3 +1,5 @@
+- nav_bar_profile = controller.try(:nav_bar_profile)
+
 .new-header{ class: current_page?(root_path) ? nil : "new-header-with-border" }
   .header-inner-content
 
@@ -5,7 +7,7 @@
       = link_to root_path, class: "header-logo" do
         %img{ src: image_url("header/logo-tps.svg") }
 
-      - if gestionnaire_signed_in?
+      - if nav_bar_profile == :gestionnaire && gestionnaire_signed_in?
         - current_url = request.path_info
         %ul.header-tabs
           - if current_gestionnaire.procedures.count > 0
@@ -29,13 +31,15 @@
                 – par email : <a href="mailto:contact@tps.apientreprise.fr">contact@tps.apientreprise.fr</a>
 
     %ul.header-right-content
-      - if gestionnaire_signed_in?
+      - if nav_bar_profile == :gestionnaire && gestionnaire_signed_in?
         %li
           .header-search
             = form_tag recherche_path, method: :get, class: "form" do
               = text_field_tag "q", "#{@search_terms if @search_terms.present?}", placeholder: "Rechercher un dossier"
               %button{ title: "Rechercher" }
                 = image_tag "icons/search-blue.svg"
+
+      - if gestionnaire_signed_in? || user_signed_in?
         %li
           .header-menu-opener
             = image_tag "icons/account-circle.svg", onclick: "javascript:TPS.toggleHeaderMenu(event);", title: "Mon compte"