Merged r12057 from trunk (#14415).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12063 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-07-28 20:46:04 +00:00
parent 5eeca35317
commit 591922c365
2 changed files with 22 additions and 2 deletions

View File

@ -295,8 +295,6 @@ private
scope = @query.results_scope(options)
if @issue
scope = scope.on_issue(@issue)
elsif @project
scope = scope.on_project(@project, Setting.display_subprojects_issues?)
end
scope
end

View File

@ -443,6 +443,28 @@ class TimelogControllerTest < ActionController::TestCase
:attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
end
def test_index_with_display_subprojects_issues_to_false_should_not_include_subproject_entries
entry = TimeEntry.generate!(:project => Project.find(3))
with_settings :display_subprojects_issues => '0' do
get :index, :project_id => 'ecookbook'
assert_response :success
assert_template 'index'
assert_not_include entry, assigns(:entries)
end
end
def test_index_with_display_subprojects_issues_to_false_and_subproject_filter_should_include_subproject_entries
entry = TimeEntry.generate!(:project => Project.find(3))
with_settings :display_subprojects_issues => '0' do
get :index, :project_id => 'ecookbook', :subproject_id => 3
assert_response :success
assert_template 'index'
assert_include entry, assigns(:entries)
end
end
def test_index_at_project_level_with_date_range
get :index, :project_id => 'ecookbook',
:f => ['spent_on'],