diff options
| -rw-r--r-- | app/views/layouts/base.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/projects_controller_test.rb | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index b2911b4ee..5c8be88e0 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -78,7 +78,7 @@ <%= hidden_field_tag 'scope', default_search_project_scope, :id => nil %> <%= 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), {:controller => 'search', :action => 'index', :id => @project, :scope => default_search_project_scope}, :accesskey => accesskey(:search) %>: </label> <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %> <% end %> diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 129dc44c0..e1a17059b 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -1044,4 +1044,35 @@ class ProjectsControllerTest < Redmine::ControllerTest } assert_select 'body.project-ecookbook' end + + def test_default_search_scope_in_global_page + get :index + + assert_select 'div#quick-search form' do + assert_select 'input[name=scope][type=hidden]' + assert_select 'a[href=?]', '/search' + end + end + + def test_default_search_scope_for_project_without_subprojects + get :show, :params => { + :id => 4, + } + + assert_select 'div#quick-search form' do + assert_select 'input[name=scope][type=hidden]' + assert_select 'a[href=?]', '/projects/subproject2/search' + end + end + + def test_default_search_scope_for_project_with_subprojects + get :show, :params => { + :id => 1, + } + + assert_select 'div#quick-search form' do + assert_select 'input[name=scope][type=hidden][value=subprojects]' + assert_select 'a[href=?]', '/projects/ecookbook/search?scope=subprojects' + end + end end |