Merge branch 'develop' into staging

2017-01-10 11:03:22 +01:00 · 2017-01-10 11:03:22 +01:00 · f538cd7ae8
commit f538cd7ae8
parent 7bfbb6b18a 672ad55651
1 changed files with 6 additions and 1 deletions
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@ -1,6 +1,11 @@
 class RootController < ApplicationController
  def index
+
+    begin
      route = Rails.application.routes.recognize_path(request.referrer)
+    rescue ActionController::RoutingError
+      route = Rails.application.routes.recognize_path(new_user_session_path)
+    end

    if Features.opensimplif
      unless !user_signed_in? && !administrateur_signed_in? && !gestionnaire_signed_in?