From 5266ab40c4629457cc0692697879837cbc9db47e Mon Sep 17 00:00:00 2001
From: Jan Schulz-Hofen <jan@plan.io>
Date: Sun, 8 Jan 2017 10:54:05 +0100
Subject: [PATCH 1/6] Use named routes for search in base layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is necessary for Doorkeeper and possibly other plugins/engines which would like to use Redmine’s base layout in a namespaced controller.
---
 app/views/layouts/base.html.erb | 6 +++---
 config/routes.rb                | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 126d86b..26576de 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -26,7 +26,7 @@
 
     <% if User.current.logged? || !Setting.login_required? %>
         <div class="flyout-menu__search">
-            <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
+            <%= form_tag(search_path(id: @project), :method => :get ) do %>
             <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
             <%= label_tag 'flyout-search', '&#9906;'.html_safe, :class => 'search-magnifier search-magnifier--flyout' %>
             <%= text_field_tag 'q', @question, :id => 'flyout-search', :class => 'small js-search-input', :placeholder => l(:label_search) %>
@@ -74,10 +74,10 @@
 
     <% if User.current.logged? || !Setting.login_required? %>
     <div id="quick-search">
-        <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
+        <%= form_tag(search_path(id: @project), :method => :get ) do %>
         <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
         <label for='q'>
-          <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>:
+          <%= link_to l(:label_search), search_path(id: @project), :accesskey => accesskey(:search) %>:
         </label>
         <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
         <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index c2a4003..d4a13bd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -336,8 +336,7 @@ Rails.application.routes.draw do
   resources :enumerations, :except => :show
   match 'enumerations/:type', :to => 'enumerations#index', :via => :get
 
-  get 'projects/:id/search', :controller => 'search', :action => 'index'
-  get 'search', :controller => 'search', :action => 'index'
+  get '(projects/:id)/search', :controller => 'search', :action => 'index', :as => 'search'
 
 
   get  'mail_handler', :to => 'mail_handler#new'
-- 
2.7.2