Merged r9371 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9373 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/routes.rb b/config/routes.rb
index 5cba46c000522b9f42f707e25eb961e2232697fb..51bb66cca6a528c84302978b0f53c8ddbb2c70b0 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -339,6 +339,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :roles, :except => :show, :collection => {:permissions => [:get, :post]}
   map.resources :enumerations, :except => :show
 
+  map.connect 'projects/:id/search', :controller => 'search', :action => 'index', :conditions => {:method => :get}
   map.connect 'search', :controller => 'search', :action => 'index', :conditions => {:method => :get}
 
   map.connect 'mail_handler', :controller => 'mail_handler',

diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index 853bfea4a520da23dde22b8a6df4c7ea77373d7e..682b9bee551e5217aa4e9851b624b0c08aa2e7fd 100644 (file)
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_test.rb
@@ -53,4 +53,14 @@ class LayoutTest < ActionController::IntegrationTest
       :attributes => {:src => %r{^/javascripts/jstoolbar/textile.js}},
       :parent => {:tag => 'head'}
   end
+
+  def test_search_field_outside_project_should_link_to_global_search
+    get '/'
+    assert_select 'div#quick-search form[action=/search]'
+  end
+
+  def test_search_field_inside_project_should_link_to_project_search
+    get '/projects/ecookbook'
+    assert_select 'div#quick-search form[action=/projects/ecookbook/search]'
+  end
 end

diff --git a/test/integration/routing/search_test.rb b/test/integration/routing/search_test.rb
index 23c1271eb857dcf76d1ae1eaae7ffd163b338816..f5b24ce35394845962484be8afdc50f0035a1f54 100644 (file)
--- a/test/integration/routing/search_test.rb
+++ b/test/integration/routing/search_test.rb
@@ -23,5 +23,9 @@ class RoutingSearchTest < ActionController::IntegrationTest
         { :method => 'get', :path => "/search" },
         { :controller => 'search', :action => 'index' }
       )
+    assert_routing(
+        { :method => 'get', :path => "/projects/foo/search" },
+        { :controller => 'search', :action => 'index', :id => 'foo' }
+      )
   end
 end