meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity

Project search should select subprojects scope when the project has subprojects (#30923).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18005 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-03-25 01:57:20 +00:00
parent 292f5ac97f
commit 391c069d87
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/base.html.erb
View File

@ -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 %>

31
test/functional/projects_controller_test.rb
View File

@ -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