From ca82fba170c704f93477ce2e156012e5bc997625 Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Tue, 19 Sep 2017 15:31:31 +0200
Subject: [PATCH] [Fix #738] TPS link on header should navigate on same UI

---
 app/controllers/root_controller.rb | 4 ++++
 app/views/layouts/_new_header.haml | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index 981e53fed..0cd686880 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -2,6 +2,10 @@ class RootController < ApplicationController
   layout 'new_application'
 
   def index
+    if params[:new_ui] && gestionnaire_signed_in? # TODO delete new_ui when old UI is no longer used
+      return redirect_to procedures_path
+    end
+
     if administrateur_signed_in?
       return redirect_to admin_procedures_path
 
diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml
index 1b9d7c703..5fff9c479 100644
--- a/app/views/layouts/_new_header.haml
+++ b/app/views/layouts/_new_header.haml
@@ -2,7 +2,8 @@
   .header-inner-content
 
     .flex.align-center
-      = link_to root_path, class: "header-logo" do
+      -# TODO delete new_ui when old UI is no longer used
+      = link_to root_path(new_ui: 1), class: "header-logo" do
         %img{ src: image_url("header/logo-tps.svg") }
 
       - if gestionnaire_signed_in?